[packages/awesfx.git] / awesfx-make.patch

diff -urN awesfx-0.4.3c.orig/Imakefile awesfx-0.4.3c/Imakefile
--- awesfx-0.4.3c.orig/Imakefile	Mon Jan 17 00:07:48 2000
+++ awesfx-0.4.3c/Imakefile	Wed Feb  2 15:44:23 2000
@@ -4,6 +4,7 @@
 
 /*CDEBUGFLAGS=-g*/
 CDEBUGFLAGS=-Wall
+CCOPTIONS=$(OPT_FLAGS)
 
 #include "awelib/config.h"
 
@@ -11,10 +12,10 @@
 SUBDIRS = awelib include
 
 /* binary and manual directories */
-INSTDIR = /usr/local
+INSTDIR = /usr
 
 BINDIR = $(INSTDIR)/bin
-MANDIR = $(INSTDIR)/man/man1
+MANDIR = $(_MANDIR)/man1
 MANSUFFIX = 1
 
 #define PassCDebugFlags CDEBUGFLAGS=$(CDEBUGFLAGS) INSTDIR=$(INSTDIR)
@@ -37,31 +38,31 @@
 
 NormalProgramTarget(sfxload, sfxload.o seq.o, $(DEPLIB),  $(AWELIB), -lm)
 AllTarget(sfxload)
-InstallProgram(sfxload, $(BINDIR))
-InstallManPage(sfxload, $(MANDIR))
+InstallProgram(sfxload,$(BINDIR))
+InstallManPage(sfxload,$(MANDIR))
 
 NormalProgramTarget(setfx, setfx.o seq.o, $(DEPLIB),  $(AWELIB), -lm)
 AllTarget(setfx)
-InstallProgram(setfx, $(BINDIR))
+InstallProgram(setfx,$(BINDIR))
 
 NormalProgramTarget(sf2text, sf2text.o, $(DEPLIB), $(AWELIB), -lm)
 AllTarget(sf2text)
-InstallProgram(sf2text, $(BINDIR))
+InstallProgram(sf2text,$(BINDIR))
 
 NormalProgramTarget(text2sf, text2sf.o, $(DEPLIB),  $(AWELIB), -lm)
 AllTarget(text2sf)
-InstallProgram(text2sf, $(BINDIR))
+InstallProgram(text2sf,$(BINDIR))
 
 NormalProgramTarget(gusload, gusload.o seq.o,,, -lm)
 AllTarget(gusload)
-InstallProgram(gusload, $(BINDIR))
+InstallProgram(gusload,$(BINDIR))
 
 NormalProgramTarget(sfxtest, sfxtest.o seq.o,,, -lm)
 AllTarget(sfxtest)
-InstallProgram(sfxtest, $(BINDIR))
+InstallProgram(sfxtest,$(BINDIR))
 
 NormalProgramTarget(aweset, aweset.o seq.o, $(DEPLIB), $(AWELIB), -lm)
 AllTarget(aweset)
-InstallProgram(aweset, $(BINDIR))
+InstallProgram(aweset,$(BINDIR))
 
 NamedMakeSubdirs($(DEPLIB),$(SUBDIRS))
diff -urN awesfx-0.4.3c.orig/awelib/Imakefile awesfx-0.4.3c/awelib/Imakefile
--- awesfx-0.4.3c.orig/awelib/Imakefile	Mon Jan 17 00:07:48 2000
+++ awesfx-0.4.3c/awelib/Imakefile	Wed Feb  2 15:46:43 2000
@@ -6,7 +6,9 @@
 
 LIBVER = 0.4.3
 
-INSTDIR = /usr/local
+CCOPTIONS=$(OPT_FLAGS)
+
+INSTDIR = /usr
 
 LIBDIR = $(INSTDIR)/lib
 INCLUDES += -I../include
@@ -24,18 +26,18 @@
 
 %.o: %.c
 	NormalSharedLibObjCompile()
-SharedLibraryTarget(awe,$(LIBVER), $(SHOBJS), ., .)
+SharedLibraryTarget(awe,$(LIBVER),$(SHOBJS), ., .)
 #ifdef INSTALL_AWELIB
-InstallSharedLibrary(awe,$(LIBVER), $(LIBDIR))
+InstallSharedLibrary(awe,$(LIBVER),$(LIBDIR))
 #endif
 
 #else
 
 %.o: %.c
 	NormalLibObjCompile()
-NormalLibraryTarget(awe, $(SHOBJS))
+NormalLibraryTarget(awe,$(SHOBJS))
 #ifdef INSTALL_AWELIB
-InstallLibrary(awe, $(LIBDIR))
+InstallLibrary(awe,$(LIBDIR))
 #endif
 
 #endif
diff -urN awesfx-0.4.3c.orig/include/Imakefile awesfx-0.4.3c/include/Imakefile
--- awesfx-0.4.3c.orig/include/Imakefile	Mon Jan 17 00:07:48 2000
+++ awesfx-0.4.3c/include/Imakefile	Mon Jan 31 14:56:41 2000
@@ -1,11 +1,11 @@
 #include "../awelib/config.h"
 
-INSTDIR = /usr/local
+INSTDIR = /usr
 INCDIR = $(INSTDIR)/include/awe
 
 HEADERS = awebank.h aweseq.h awe_parm.h sffile.h itypes.h sfitem.h sflayer.h\
 	sfopts.h slist.h util.h
 
 #ifdef INSTALL_AWELIB
-InstallMultiple($(HEADERS), $(INCDIR))
+InstallMultiple($(HEADERS),$(INCDIR))
 #endif
Commit	Line	Data
300173c7	1	diff -urN awesfx-0.4.3c.orig/Imakefile awesfx-0.4.3c/Imakefile
	2	--- awesfx-0.4.3c.orig/Imakefile Mon Jan 17 00:07:48 2000
	3	+++ awesfx-0.4.3c/Imakefile Wed Feb 2 15:44:23 2000
	4	@@ -4,6 +4,7 @@
	5
	6	/CDEBUGFLAGS=-g/
	7	CDEBUGFLAGS=-Wall
97e8b2d1	8	+CCOPTIONS=$(OPT_FLAGS)
300173c7	9
	10	#include "awelib/config.h"
	11
	12	@@ -11,10 +12,10 @@
	13	SUBDIRS = awelib include
	14
	15	/* binary and manual directories */
	16	-INSTDIR = /usr/local
	17	+INSTDIR = /usr
	18
	19	BINDIR = $(INSTDIR)/bin
	20	-MANDIR = $(INSTDIR)/man/man1
	21	+MANDIR = $(_MANDIR)/man1
	22	MANSUFFIX = 1
	23
	24	#define PassCDebugFlags CDEBUGFLAGS=$(CDEBUGFLAGS) INSTDIR=$(INSTDIR)
	25	@@ -37,31 +38,31 @@
	26
	27	NormalProgramTarget(sfxload, sfxload.o seq.o, $(DEPLIB), $(AWELIB), -lm)
	28	AllTarget(sfxload)
	29	-InstallProgram(sfxload, $(BINDIR))
	30	-InstallManPage(sfxload, $(MANDIR))
	31	+InstallProgram(sfxload,$(BINDIR))
	32	+InstallManPage(sfxload,$(MANDIR))
	33
	34	NormalProgramTarget(setfx, setfx.o seq.o, $(DEPLIB), $(AWELIB), -lm)
	35	AllTarget(setfx)
	36	-InstallProgram(setfx, $(BINDIR))
	37	+InstallProgram(setfx,$(BINDIR))
	38
	39	NormalProgramTarget(sf2text, sf2text.o, $(DEPLIB), $(AWELIB), -lm)
	40	AllTarget(sf2text)
	41	-InstallProgram(sf2text, $(BINDIR))
	42	+InstallProgram(sf2text,$(BINDIR))
	43
	44	NormalProgramTarget(text2sf, text2sf.o, $(DEPLIB), $(AWELIB), -lm)
	45	AllTarget(text2sf)
	46	-InstallProgram(text2sf, $(BINDIR))
	47	+InstallProgram(text2sf,$(BINDIR))
	48
	49	NormalProgramTarget(gusload, gusload.o seq.o,,, -lm)
	50	AllTarget(gusload)
	51	-InstallProgram(gusload, $(BINDIR))
	52	+InstallProgram(gusload,$(BINDIR))
	53
	54	NormalProgramTarget(sfxtest, sfxtest.o seq.o,,, -lm)
	55	AllTarget(sfxtest)
	56	-InstallProgram(sfxtest, $(BINDIR))
	57	+InstallProgram(sfxtest,$(BINDIR))
	58
	59	NormalProgramTarget(aweset, aweset.o seq.o, $(DEPLIB), $(AWELIB), -lm)
	60	AllTarget(aweset)
	61	-InstallProgram(aweset, $(BINDIR))
	62	+InstallProgram(aweset,$(BINDIR))
	63
	64	NamedMakeSubdirs($(DEPLIB),$(SUBDIRS))
	65	diff -urN awesfx-0.4.3c.orig/awelib/Imakefile awesfx-0.4.3c/awelib/Imakefile
	66	--- awesfx-0.4.3c.orig/awelib/Imakefile Mon Jan 17 00:07:48 2000
	67	+++ awesfx-0.4.3c/awelib/Imakefile Wed Feb 2 15:46:43 2000
	68	@@ -6,7 +6,9 @@
	69
	70	LIBVER = 0.4.3
	71
	72	-INSTDIR = /usr/local
97e8b2d1	73	+CCOPTIONS=$(OPT_FLAGS)
300173c7	74	+
	75	+INSTDIR = /usr
	76
	77	LIBDIR = $(INSTDIR)/lib
	78	INCLUDES += -I../include
	79	@@ -24,18 +26,18 @@
	80
	81	%.o: %.c
	82	NormalSharedLibObjCompile()
	83	-SharedLibraryTarget(awe,$(LIBVER), $(SHOBJS), ., .)
	84	+SharedLibraryTarget(awe,$(LIBVER),$(SHOBJS), ., .)
	85	#ifdef INSTALL_AWELIB
	86	-InstallSharedLibrary(awe,$(LIBVER), $(LIBDIR))
	87	+InstallSharedLibrary(awe,$(LIBVER),$(LIBDIR))
	88	#endif
	89
	90	#else
	91
	92	%.o: %.c
	93	NormalLibObjCompile()
	94	-NormalLibraryTarget(awe, $(SHOBJS))
	95	+NormalLibraryTarget(awe,$(SHOBJS))
	96	#ifdef INSTALL_AWELIB
	97	-InstallLibrary(awe, $(LIBDIR))
	98	+InstallLibrary(awe,$(LIBDIR))
	99	#endif
	100
	101	#endif
	102	diff -urN awesfx-0.4.3c.orig/include/Imakefile awesfx-0.4.3c/include/Imakefile
	103	--- awesfx-0.4.3c.orig/include/Imakefile Mon Jan 17 00:07:48 2000
	104	+++ awesfx-0.4.3c/include/Imakefile Mon Jan 31 14:56:41 2000
	105	@@ -1,11 +1,11 @@
	106	#include "../awelib/config.h"
	107
	108	-INSTDIR = /usr/local
	109	+INSTDIR = /usr
	110	INCDIR = $(INSTDIR)/include/awe
	111
	112	HEADERS = awebank.h aweseq.h awe_parm.h sffile.h itypes.h sfitem.h sflayer.h\
	113	sfopts.h slist.h util.h
	114
	115	#ifdef INSTALL_AWELIB
	116	-InstallMultiple($(HEADERS), $(INCDIR))
	117	+InstallMultiple($(HEADERS),$(INCDIR))
	118	#endif