File aeolus-makefile.patch of Package aeolus

Overview Repositories Revisions Requests Users Attributes Meta

File aeolus-makefile.patch of Package aeolus

--- Makefile
+++ Makefile
@@ -15,12 +15,12 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-PREFIX = /usr
-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-LIBDIR = lib$(SUFFIX)
+PREFIX = $(DESTDIR)/usr
+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+#LIBDIR = lib$(SUFFIX)
 VERSION = 0.6.6
 DISTDIR = aeolus-$(VERSION)
-CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
+CXXFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\" $(SUSE_CXXFLAGS)
 #CPPFLAGS += -march=pentium4
 
 all:	aeolus aeolus_x11.so aeolus_txt.so
@@ -33,14 +33,14 @@
 aeolus:	$(AEOLUS_O)
 	g++ $(LDFLAGS) -o $@ $(AEOLUS_O) $(LDLIBS)
 
-addsynth.o:	CPPFLAGS += -fpic -D_REENTRANT
+addsynth.o:	CXXFLAGS += -fpic -D_REENTRANT
 $(AEOLUS_O):
 -include $(AEOLUS_O:%.o=%.d)
 
 
 XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o midimatrix.o \
 		multislider.o functionwin.o xiface.o addsynth.o
-aeolus_x11.so:	CPPFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
+aeolus_x11.so:	CXXFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
 aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lXft -lX11
 aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
 aeolus_x11.so: $(XIFACE_O) $(LIBCLX)
@@ -52,7 +52,7 @@
 
 
 TIFACE_O =	tiface.o
-aeolus_txt.so:	CPPFLAGS += -fpic -D_REENTRANT
+aeolus_txt.so:	CXXFLAGS += -fpic -D_REENTRANT
 aeolus_txt.so:	LDLIBS += -lclthreads
 aeolus_txt.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR)
 aeolus_txt.so: $(TIFACE_O)
@@ -67,7 +67,6 @@
 	/usr/bin/install -m 755 aeolus $(PREFIX)/bin
 	/usr/bin/install -m 755 aeolus_x11.so $(PREFIX)/$(LIBDIR)
 	/usr/bin/install -m 755 aeolus_txt.so $(PREFIX)/$(LIBDIR)
-	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
 
 clean:
 	/bin/rm -f *~ *.o *.d *.a *.so aeolus

Places

File aeolus-makefile.patch of Package aeolus

Places