Fix build for ELF.
This commit is contained in:
parent
1a3f9e8f13
commit
a2ee0ac9ca
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13478
@ -1,22 +1,30 @@
|
||||
*** Makefile.FreeBSD.orig Wed Sep 11 06:04:21 1996
|
||||
--- Makefile.FreeBSD Thu Aug 28 15:53:28 1997
|
||||
***************
|
||||
*** 265,270 ****
|
||||
--- 265,281 ----
|
||||
( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
|
||||
$(MAKE) depend )
|
||||
|
||||
+ install:
|
||||
+ $(MKDIR) $(PREFIX)/lib/rosegarden
|
||||
+ $(MKDIR) $(PREFIX)/lib/rosegarden/music
|
||||
+ $(INSTALL_PROGRAM) ./bin/rosegarden $(PREFIX)/bin
|
||||
+ $(INSTALL_PROGRAM) ./bin/editor $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_PROGRAM) ./bin/sequencer $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/help/* $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/synth-patches/std.sb $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/music/*.rose $(PREFIX)/lib/rosegarden/music
|
||||
+ $(INSTALL_DATA) Rosegarden $(X11BASE)/lib/X11/app-defaults/
|
||||
+
|
||||
clean:
|
||||
( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
|
||||
$(MAKE) clean )
|
||||
--- Makefile.FreeBSD.orig Tue Sep 10 16:04:21 1996
|
||||
+++ Makefile.FreeBSD Fri Sep 25 11:19:37 1998
|
||||
@@ -139,6 +139,9 @@
|
||||
# System library directories, also exported
|
||||
|
||||
SYSLDFLAGS = -L/usr/lib -L/usr/X11R6/lib
|
||||
+.if ${PORTOBJFORMAT} == "elf"
|
||||
+SYSLDFLAGS += -Wl,-rpath,/usr/X11R6/lib
|
||||
+.endif
|
||||
SYSEXTRALIBS = -lmalloc
|
||||
|
||||
|
||||
@@ -264,6 +267,17 @@
|
||||
$(MAKE) depend )
|
||||
( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
|
||||
$(MAKE) depend )
|
||||
+
|
||||
+install:
|
||||
+ $(MKDIR) $(PREFIX)/lib/rosegarden
|
||||
+ $(MKDIR) $(PREFIX)/lib/rosegarden/music
|
||||
+ $(INSTALL_PROGRAM) ./bin/rosegarden $(PREFIX)/bin
|
||||
+ $(INSTALL_PROGRAM) ./bin/editor $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_PROGRAM) ./bin/sequencer $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/help/* $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/synth-patches/std.sb $(PREFIX)/lib/rosegarden
|
||||
+ $(INSTALL_DATA) ./common/music/*.rose $(PREFIX)/lib/rosegarden/music
|
||||
+ $(INSTALL_DATA) Rosegarden $(X11BASE)/lib/X11/app-defaults/
|
||||
|
||||
clean:
|
||||
( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig Tue Aug 18 22:28:09 1998
|
||||
+++ Makefile.in Tue Aug 18 22:31:13 1998
|
||||
--- Makefile.in.orig Tue Feb 10 16:37:20 1998
|
||||
+++ Makefile.in Sun Sep 27 20:24:53 1998
|
||||
@@ -14,7 +14,8 @@
|
||||
DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
|
||||
CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
|
||||
@ -10,3 +10,13 @@
|
||||
|
||||
#
|
||||
# uncomment both of these if you want profiling support
|
||||
@@ -38,6 +39,9 @@
|
||||
backs/backs.o
|
||||
|
||||
LIBS = @QT_LDFLAGS@ -lm -lqt
|
||||
+ifeq ($(PORTOBJFORMAT),elf)
|
||||
+LIBS+= -Wl,-rpath,$(X11BASE)/lib
|
||||
+endif
|
||||
|
||||
all: xamp
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user