[packages/bush.git] / bush-Makefile.patch

diff -Nur bush-0.9.3.orig/ADAVOX-0.51/main/Makefile bush-0.9.3/ADAVOX-0.51/main/Makefile
--- bush-0.9.3.orig/ADAVOX-0.51/main/Makefile	2003-10-16 05:08:47.000000000 +0200
+++ bush-0.9.3/ADAVOX-0.51/main/Makefile	2004-03-04 21:34:42.000000000 +0100
@@ -11,7 +11,6 @@
 #
 # MODIFY THE CPU= LINE OUT IF YOU ARE NOT RUNNING ON A PENTIUM
 #
-CPU=pentiumpro # -m486
 
 #
 # MODIFY THE NEXT LINES WHEN DEBUGGING (NB: Do not use -O1 or higher)
@@ -22,9 +21,9 @@
 INC=	-I../bc -I../wc
 LIB=	-largs ../wc/cglue.o
 
-COPTS=	-Wall $(OPTZ) -m$(CPU)
+COPTS=	-Wall $(OPTZ)
 AOPTS=  $(INC) -gnatf $(GNATOPTS)
-AOPTZ=  $(OPTZ) -m$(CPU)
+AOPTZ=  $(OPTZ)
 
 CC=     gcc
 
diff -Nur bush-0.9.3.orig/ADAVOX-0.51/Makefile bush-0.9.3/ADAVOX-0.51/Makefile
--- bush-0.9.3.orig/ADAVOX-0.51/Makefile	2003-10-16 05:08:41.000000000 +0200
+++ bush-0.9.3/ADAVOX-0.51/Makefile	2004-03-04 21:48:42.000000000 +0100
@@ -8,14 +8,12 @@
 #
 # To override, example: $ make CPU=486 INSTDIR=/opt/local/bin
 #
-INSTDIR=/usr/local/bin
-CPU=pentiumpro			
-OPTZ=
+INSTDIR=/usr/bin
 GNATOPTS=-gnato -gnata -gnatn -q -c -i
 
 all:
-	(cd ./wc   ; $(MAKE) -$(MAKEFLAGS) all)
-	(cd ./main ; $(MAKE) -$(MAKEFLAGS) INSTDIR=$(INSTDIR) CPU=$(CPU) OPTZ=$(OPTZ) all)
+	(cd ./wc   ; $(MAKE) -$(MAKEFLAGS) all CFLAGS="$(CFLAGS)")
+	(cd ./main ; $(MAKE) -$(MAKEFLAGS) all INSTDIR=$(INSTDIR) CFLAGS="$(CFLAGS)")
 
 clean:
 	(cd ./wc   ; $(MAKE) -$(MAKEFLAGS) clean)
diff -Nur bush-0.9.3.orig/apq-2.1/eg/Makefile bush-0.9.3/apq-2.1/eg/Makefile
--- bush-0.9.3.orig/apq-2.1/eg/Makefile	2003-09-24 21:56:28.000000000 +0200
+++ bush-0.9.3/apq-2.1/eg/Makefile	2004-03-04 21:46:15.000000000 +0100
@@ -7,7 +7,7 @@
 
 #DBG=-g
 CC=gcc
-COPTS=-c -Wall
+COPTS=-c -Wall $(CFLAGS)
 AOPTS=$(DBG) -gnato -gnata -gnatf
 
 .c.o:
diff -Nur bush-0.9.3.orig/apq-2.1/Makefile bush-0.9.3/apq-2.1/Makefile
--- bush-0.9.3.orig/apq-2.1/Makefile	2003-09-24 21:56:23.000000000 +0200
+++ bush-0.9.3/apq-2.1/Makefile	2004-03-04 22:06:56.000000000 +0100
@@ -10,16 +10,14 @@
 DISTFILE=apq-$(VERSION).tar.gz
 
 #DBG=-g
-OPTZ=-O0
 
 CC=gcc
 
-ZOPTS=$(DBG) $(OPTZ)
-COPTS=-Wall $(ZOPTS)
+COPTS="-Wall $(CFLAGS)"
 AOPTS=-gnata -gnatf -gnato -gnatwp $(ZOPTS)
 
 .c.o:
-	$(CC) -c $(COPTS) $(ZOPTS) $(PG_INCL) $(MY_INCL) $< -o $*.o
+	$(CC) -c $(COPTS) $(PG_INCL) $(MY_INCL) $< -o $*.o
 
 all:	setup$(HAVE_MY) mysql$(HAVE_MY) postgresql$(HAVE_PG) libapq.a finish
 
@@ -40,7 +38,7 @@
 	ADA_INCLUDE_PATH=. ADA_OBJECTS_PATH=. gnatmake -c $(AOPTS) comp_mysql
 
 c_mysql.o: c_mysql.c
-	$(CC) -c $(COPTS) $(ZOPTS) $(MY_INCL) c_mysql.c -o c_mysql.o
+	$(CC) -c $(COPTS) $(MY_INCL) c_mysql.c -o c_mysql.o
 
 apq-mysql.ads: apq-mysql.ads-in mysql_generr.c mysql_xcr2 mysql_xcr3
 	@rm -f mysql_errmsg.h mysql_generr
@@ -97,7 +95,7 @@
 	rm -f mysql_errmsg.h mysql_type_codes.h mysql_generr Makeincl tmysql apq-mysql.ads
 	rm -f libapq.a GNUmakefile
 	rm -fr ./release $(DISTFILE)
-	cd ./eg; $(MAKE) clobber
+	cd ./eg; $(MAKE) clobber CFLAGS="$(CFLAGS)"
 	rm -f apq-1.93-win32-2.7.1.tar.gz
 
 manual: apq-manual.pdf
diff -Nur bush-0.9.3.orig/Makefile bush-0.9.3/Makefile
--- bush-0.9.3.orig/Makefile	2003-11-29 22:12:41.000000000 +0100
+++ bush-0.9.3/Makefile	2004-03-04 21:42:50.000000000 +0100
@@ -15,21 +15,21 @@
 	@echo "    http://www.dwheeler.com/adacgi"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C adacgi-1.6
+	make -C adacgi-1.6 "CFLAGS=$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo "  Making AdaVOX (Wav/AU Player)"
 	@echo "    http://home.cogeco.ca/~ve3wwg"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C ADAVOX-0.51
+	make -C ADAVOX-0.51 CFLAGS="$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo "  Making APQ (PostgreSQL/MySQL DBI)"
 	@echo "    http://home.cogeco.ca/~ve3wwg"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C apq-2.1/
+	make -C apq-2.1/ CFLAGS="$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo " Making BUSH"
@@ -73,20 +73,20 @@
 	@echo "Making AdaCGI"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C adacgi-1.6
+	make -C adacgi-1.6 CFLAGS="$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo "Making AdaVOX"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C ADAVOX-0.51
+	make -C ADAVOX-0.51 CFLAGS="$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo "  Making APQ (PostgreSQL/MySQL DBI)"
 	@echo "    http://home.cogeco.ca/~ve3wwg"
 	@echo "---------------------------------------------------------------"
 	@echo
-	gmake -C apq-2.1/
+	make -C apq-2.1/ CFLAGS="$(CFLAGS)"
 	@echo
 	@echo "---------------------------------------------------------------"
 	@echo "Making BUSH"
@@ -97,9 +97,9 @@
 	gnatlink bush.ali ./ADAVOX-0.51/wc/cglue.o c_os.o $(LIBS)
 
 clean:
-	gmake -C adacgi-1.6 clean
-	gmake -C apq-2.1 clean
-	gmake -C ADAVOX-0.51 clean
+	make -C adacgi-1.6 clean
+	make -C apq-2.1 clean
+	make -C ADAVOX-0.51 clean
 	rm -f *.o *.ali t.t t.bush core bush.zip bush
 
 test:	all
@@ -135,10 +135,10 @@
 	@echo "Don't forget to unpack and repack under a descriptive directory"
 
 install:
-	install --mode=555 bush /usr/local/bin/bush
+	install --mode=555 bush $(DESTDIR)/bin/bush
 
 uninstall:
-	rm /usr/local/bin/bush
+	rm $(DESTDIR)/bin/bush
 
 help:
 	@echo "First you need one of these"
Commit	Line	Data
11862f6f	1	diff -Nur bush-0.9.3.orig/ADAVOX-0.51/main/Makefile bush-0.9.3/ADAVOX-0.51/main/Makefile
	2	--- bush-0.9.3.orig/ADAVOX-0.51/main/Makefile 2003-10-16 05:08:47.000000000 +0200
	3	+++ bush-0.9.3/ADAVOX-0.51/main/Makefile 2004-03-04 21:34:42.000000000 +0100
	4	@@ -11,7 +11,6 @@
	5	#
	6	# MODIFY THE CPU= LINE OUT IF YOU ARE NOT RUNNING ON A PENTIUM
	7	#
	8	-CPU=pentiumpro # -m486
	9
	10	#
	11	# MODIFY THE NEXT LINES WHEN DEBUGGING (NB: Do not use -O1 or higher)
	12	@@ -22,9 +21,9 @@
	13	INC= -I../bc -I../wc
	14	LIB= -largs ../wc/cglue.o
	15
	16	-COPTS= -Wall $(OPTZ) -m$(CPU)
	17	+COPTS= -Wall $(OPTZ)
	18	AOPTS= $(INC) -gnatf $(GNATOPTS)
	19	-AOPTZ= $(OPTZ) -m$(CPU)
	20	+AOPTZ= $(OPTZ)
	21
	22	CC= gcc
	23
	24	diff -Nur bush-0.9.3.orig/ADAVOX-0.51/Makefile bush-0.9.3/ADAVOX-0.51/Makefile
	25	--- bush-0.9.3.orig/ADAVOX-0.51/Makefile 2003-10-16 05:08:41.000000000 +0200
	26	+++ bush-0.9.3/ADAVOX-0.51/Makefile 2004-03-04 21:48:42.000000000 +0100
	27	@@ -8,14 +8,12 @@
	28	#
	29	# To override, example: $ make CPU=486 INSTDIR=/opt/local/bin
	30	#
	31	-INSTDIR=/usr/local/bin
	32	-CPU=pentiumpro
	33	-OPTZ=
	34	+INSTDIR=/usr/bin
	35	GNATOPTS=-gnato -gnata -gnatn -q -c -i
	36
	37	all:
	38	- (cd ./wc ; $(MAKE) -$(MAKEFLAGS) all)
	39	- (cd ./main ; $(MAKE) -$(MAKEFLAGS) INSTDIR=$(INSTDIR) CPU=$(CPU) OPTZ=$(OPTZ) all)
	40	+ (cd ./wc ; $(MAKE) -$(MAKEFLAGS) all CFLAGS="$(CFLAGS)")
	41	+ (cd ./main ; $(MAKE) -$(MAKEFLAGS) all INSTDIR=$(INSTDIR) CFLAGS="$(CFLAGS)")
	42
	43	clean:
	44	(cd ./wc ; $(MAKE) -$(MAKEFLAGS) clean)
	45	diff -Nur bush-0.9.3.orig/apq-2.1/eg/Makefile bush-0.9.3/apq-2.1/eg/Makefile
	46	--- bush-0.9.3.orig/apq-2.1/eg/Makefile 2003-09-24 21:56:28.000000000 +0200
	47	+++ bush-0.9.3/apq-2.1/eg/Makefile 2004-03-04 21:46:15.000000000 +0100
	48	@@ -7,7 +7,7 @@
	49
	50	#DBG=-g
	51	CC=gcc
	52	-COPTS=-c -Wall
	53	+COPTS=-c -Wall $(CFLAGS)
	54	AOPTS=$(DBG) -gnato -gnata -gnatf
	55
	56	.c.o:
	57	diff -Nur bush-0.9.3.orig/apq-2.1/Makefile bush-0.9.3/apq-2.1/Makefile
	58	--- bush-0.9.3.orig/apq-2.1/Makefile 2003-09-24 21:56:23.000000000 +0200
	59	+++ bush-0.9.3/apq-2.1/Makefile 2004-03-04 22:06:56.000000000 +0100
	60	@@ -10,16 +10,14 @@
	61	DISTFILE=apq-$(VERSION).tar.gz
	62
	63	#DBG=-g
	64	-OPTZ=-O0
65
66	CC=gcc
67
68	-ZOPTS=$(DBG) $(OPTZ)
69	-COPTS=-Wall $(ZOPTS)
70	+COPTS="-Wall $(CFLAGS)"
71	AOPTS=-gnata -gnatf -gnato -gnatwp $(ZOPTS)
72
73	.c.o:
74	- $(CC) -c $(COPTS) $(ZOPTS) $(PG_INCL) $(MY_INCL) $< -o $*.o
75	+ $(CC) -c $(COPTS) $(PG_INCL) $(MY_INCL) $< -o $*.o
76
77	all: setup$(HAVE_MY) mysql$(HAVE_MY) postgresql$(HAVE_PG) libapq.a finish
78
79	@@ -40,7 +38,7 @@
80	ADA_INCLUDE_PATH=. ADA_OBJECTS_PATH=. gnatmake -c $(AOPTS) comp_mysql
81
82	c_mysql.o: c_mysql.c
83	- $(CC) -c $(COPTS) $(ZOPTS) $(MY_INCL) c_mysql.c -o c_mysql.o
84	+ $(CC) -c $(COPTS) $(MY_INCL) c_mysql.c -o c_mysql.o
85
86	apq-mysql.ads: apq-mysql.ads-in mysql_generr.c mysql_xcr2 mysql_xcr3
87	@rm -f mysql_errmsg.h mysql_generr
88	@@ -97,7 +95,7 @@
89	rm -f mysql_errmsg.h mysql_type_codes.h mysql_generr Makeincl tmysql apq-mysql.ads
90	rm -f libapq.a GNUmakefile
91	rm -fr ./release $(DISTFILE)
92	- cd ./eg; $(MAKE) clobber
93	+ cd ./eg; $(MAKE) clobber CFLAGS="$(CFLAGS)"
94	rm -f apq-1.93-win32-2.7.1.tar.gz
95
96	manual: apq-manual.pdf
97	diff -Nur bush-0.9.3.orig/Makefile bush-0.9.3/Makefile
98	--- bush-0.9.3.orig/Makefile 2003-11-29 22:12:41.000000000 +0100
99	+++ bush-0.9.3/Makefile 2004-03-04 21:42:50.000000000 +0100
100	@@ -15,21 +15,21 @@
101	@echo " http://www.dwheeler.com/adacgi"
102	@echo "---------------------------------------------------------------"
103	@echo
104	- gmake -C adacgi-1.6
105	+ make -C adacgi-1.6 "CFLAGS=$(CFLAGS)"
106	@echo
107	@echo "---------------------------------------------------------------"
108	@echo " Making AdaVOX (Wav/AU Player)"
109	@echo " http://home.cogeco.ca/~ve3wwg"
110	@echo "---------------------------------------------------------------"
111	@echo
112	- gmake -C ADAVOX-0.51
113	+ make -C ADAVOX-0.51 CFLAGS="$(CFLAGS)"
114	@echo
115	@echo "---------------------------------------------------------------"
116	@echo " Making APQ (PostgreSQL/MySQL DBI)"
117	@echo " http://home.cogeco.ca/~ve3wwg"
118	@echo "---------------------------------------------------------------"
119	@echo
120	- gmake -C apq-2.1/
121	+ make -C apq-2.1/ CFLAGS="$(CFLAGS)"
122	@echo
123	@echo "---------------------------------------------------------------"
124	@echo " Making BUSH"
125	@@ -73,20 +73,20 @@
126	@echo "Making AdaCGI"
127	@echo "---------------------------------------------------------------"
128	@echo
129	- gmake -C adacgi-1.6
130	+ make -C adacgi-1.6 CFLAGS="$(CFLAGS)"
131	@echo
132	@echo "---------------------------------------------------------------"
133	@echo "Making AdaVOX"
134	@echo "---------------------------------------------------------------"
135	@echo
136	- gmake -C ADAVOX-0.51
137	+ make -C ADAVOX-0.51 CFLAGS="$(CFLAGS)"
138	@echo
139	@echo "---------------------------------------------------------------"
140	@echo " Making APQ (PostgreSQL/MySQL DBI)"
141	@echo " http://home.cogeco.ca/~ve3wwg"
142	@echo "---------------------------------------------------------------"
143	@echo
144	- gmake -C apq-2.1/
145	+ make -C apq-2.1/ CFLAGS="$(CFLAGS)"
146	@echo
147	@echo "---------------------------------------------------------------"
148	@echo "Making BUSH"
149	@@ -97,9 +97,9 @@
150	gnatlink bush.ali ./ADAVOX-0.51/wc/cglue.o c_os.o $(LIBS)
151
152	clean:
153	- gmake -C adacgi-1.6 clean
154	- gmake -C apq-2.1 clean
155	- gmake -C ADAVOX-0.51 clean
156	+ make -C adacgi-1.6 clean
157	+ make -C apq-2.1 clean
158	+ make -C ADAVOX-0.51 clean
159	rm -f .o .ali t.t t.bush core bush.zip bush
160
161	test: all
162	@@ -135,10 +135,10 @@
163	@echo "Don't forget to unpack and repack under a descriptive directory"
164
165	install:
166	- install --mode=555 bush /usr/local/bin/bush
167	+ install --mode=555 bush $(DESTDIR)/bin/bush
168
169	uninstall:
170	- rm /usr/local/bin/bush
171	+ rm $(DESTDIR)/bin/bush
172
173	help:
174	@echo "First you need one of these"