[packages/awka.git] / awka-DESTDIR.patch

diff -Nru awka-0.7.0/Makefile.in awka-0.7.0.new/Makefile.in
--- awka-0.7.0/Makefile.in	Fri Aug 11 15:49:46 2000
+++ awka-0.7.0.new/Makefile.in	Fri Aug 11 15:22:02 2000
@@ -20,13 +20,11 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 # where to put the man pages
-MANEXT = @MANEXT@
-MANSRCDIR = @mandir@
-MANDIR = $(MANSRCDIR)/man$(MANEXT)
+mandir = @mandir@
 BUILDLIB = libawka.@BUILDLIB@
 #######################################
 
@@ -46,19 +44,17 @@
 libdfa: 
 	cd dfa; $(MAKE)
 
-AWKAMAN = $(MANDIR)/awka.$(MANEXT)
 install:  awka_exe libawka
-	if [ ! -d $(LIBDIR) ]; then mkdir -p $(LIBDIR); fi
-	if [ ! -d $(INCDIR) ]; then mkdir -p $(INCDIR); fi
-	if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
-	if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
+	mkdir -p $(DESTDIR)$(libdir)
+	mkdir -p $(DESTDIR)$(includedir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
 	cd awka; $(MAKE) install
 	cd lib; $(MAKE) install
 	cd dfa; $(MAKE) install
-	cp  doc/awka.1  $(AWKAMAN)
-	cp  doc/awka-elm.5  $(MANSRCDIR)/man5
-	cp  doc/awka-elmref.5  $(MANSRCDIR)/man5
-	chmod  0644  $(AWKAMAN)
+	cp  doc/awka.1 $(DESTDIR)$(mandir)/man1
+	cp  doc/awka-elm.5 $(DESTDIR)$(mandir)/man5
+	cp  doc/awka-elmref.5 $(DESTDIR)$(mandir)/man1
 
 clean:
 	cd awka; $(MAKE) clean
diff -Nru awka-0.7.0/awka/Makefile.in awka-0.7.0.new/awka/Makefile.in
--- awka-0.7.0/awka/Makefile.in	Fri Aug 11 15:49:46 2000
+++ awka-0.7.0.new/awka/Makefile.in	Fri Aug 11 15:50:34 2000
@@ -14,17 +14,15 @@
 
 YACC = @YACC@ 
 AWK = @AWK@
+LDFLAGS = @LDFLAGS@
 
 # where to put awka
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
-# where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 #######################################
 
 MAKEFILEIN = Makefile.in
@@ -40,7 +38,7 @@
 	cd ..; /bin/sh ./config.status
 
 awka : $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o awka
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o awka
 
 parse.c  : parse.y
 	@echo  expect 6 shift/reduce conflicts
@@ -51,8 +49,8 @@
 	else mv y.tab.h parse.h ; fi
 
 install :  awka
-	cp awka$(EXE) $(BINDIR)
-	chmod a+rx $(BINDIR)/awka$(EXE)
+	cp awka$(EXE) $(DESTDIR)$(bindir)
+	chmod a+rx $(DESTDIR)$(bindir)/awka$(EXE)
 
 clean :
 	rm -f *.o core awka awka$(EXE)
diff -Nru awka-0.7.0/dfa/Makefile.in awka-0.7.0.new/dfa/Makefile.in
--- awka-0.7.0/dfa/Makefile.in	Fri Aug 11 15:49:46 2000
+++ awka-0.7.0.new/dfa/Makefile.in	Fri Aug 11 15:18:34 2000
@@ -18,12 +18,9 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
-# where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 BUILDLIB = libdfa.@BUILDLIB@
 #######################################
 
@@ -46,11 +43,11 @@
 	$(CC) -shared $(CFLAGS) $(LOBJS) -o libdfa.so
 
 install :  libdfa.a
-	cp libdfa.a $(LIBDIR)
-	if [ -f libdfa.so ]; then cp libdfa.so $(LIBDIR); fi
-	cp dfa.h $(INCDIR)
-	chmod a+r $(LIBDIR)/libdfa.*
-	chmod a+r $(INCDIR)/dfa.h
+	cp libdfa.a $(DESTDIR)$(libdir)
+	if [ -f libdfa.so ]; then cp libdfa.so $(DESTDIR)$(libdir); fi
+	cp dfa.h $(DESTDIR)$(includedir)
+	chmod a+r $(DESTDIR)$(libdir)/libdfa.*
+	chmod a+r $(DESTDIR)$(includedir)/dfa.h
 
 clean :
 	rm -f *.o core libdfa.a libdfa.so 
diff -Nru awka-0.7.0/lib/Makefile.in awka-0.7.0.new/lib/Makefile.in
--- awka-0.7.0/lib/Makefile.in	Fri Aug 11 15:49:46 2000
+++ awka-0.7.0.new/lib/Makefile.in	Fri Aug 11 15:18:19 2000
@@ -18,12 +18,9 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
-# where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 BUILDLIB = libawka.@BUILDLIB@
 #######################################
 
@@ -56,11 +53,11 @@
 	$(AWK) -f ../examples/fixhdr.awk libawka.h.in >libawka.h
 
 install :  libawka.a
-	cp libawka.a $(LIBDIR)
-	if [ -f libawka.so ]; then cp libawka.so $(LIBDIR); fi
-	cp libawka.h $(INCDIR)
-	chmod a+r $(LIBDIR)/libawka.*
-	chmod a+r $(INCDIR)/libawka.h
+	cp libawka.a $(DESTDIR)$(libdir)
+	if [ -f libawka.so ]; then cp libawka.so $(DESTDIR)$(libdir); fi
+	cp libawka.h $(DESTDIR)$(includedir)
+	chmod a+r $(DESTDIR)$(libdir)/libawka.*
+	chmod a+r $(DESTDIR)$(includedir)/libawka.h
 
 clean :
 	rm -f *.o ../regexp/*.o ../regexp/.done core libawka.a libawka.so libawka.h
Commit	Line	Data
60d29e1d	1	diff -Nru awka-0.7.0/Makefile.in awka-0.7.0.new/Makefile.in
19bdfa7c	2	--- awka-0.7.0/Makefile.in Fri Aug 11 15:49:46 2000
60d29e1d	3	+++ awka-0.7.0.new/Makefile.in Fri Aug 11 15:22:02 2000
	4	@@ -20,13 +20,11 @@
	5	prefix = @prefix@
	6	exec_prefix = @exec_prefix@
	7
	8	-BINDIR = @bindir@
	9	-LIBDIR = @libdir@
	10	-INCDIR = @includedir@
	11	+bindir = @bindir@
	12	+libdir = @libdir@
	13	+includedir = @includedir@
	14	# where to put the man pages
	15	-MANEXT = @MANEXT@
	16	-MANSRCDIR = @mandir@
	17	-MANDIR = $(MANSRCDIR)/man$(MANEXT)
	18	+mandir = @mandir@
	19	BUILDLIB = libawka.@BUILDLIB@
	20	#######################################
	21
	22	@@ -46,19 +44,17 @@
	23	libdfa:
	24	cd dfa; $(MAKE)
	25
	26	-AWKAMAN = $(MANDIR)/awka.$(MANEXT)
	27	install: awka_exe libawka
	28	- if [ ! -d $(LIBDIR) ]; then mkdir -p $(LIBDIR); fi
	29	- if [ ! -d $(INCDIR) ]; then mkdir -p $(INCDIR); fi
	30	- if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
	31	- if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
	32	+ mkdir -p $(DESTDIR)$(libdir)
	33	+ mkdir -p $(DESTDIR)$(includedir)
	34	+ mkdir -p $(DESTDIR)$(bindir)
	35	+ mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
	36	cd awka; $(MAKE) install
	37	cd lib; $(MAKE) install
	38	cd dfa; $(MAKE) install
	39	- cp doc/awka.1 $(AWKAMAN)
	40	- cp doc/awka-elm.5 $(MANSRCDIR)/man5
	41	- cp doc/awka-elmref.5 $(MANSRCDIR)/man5
	42	- chmod 0644 $(AWKAMAN)
	43	+ cp doc/awka.1 $(DESTDIR)$(mandir)/man1
	44	+ cp doc/awka-elm.5 $(DESTDIR)$(mandir)/man5
	45	+ cp doc/awka-elmref.5 $(DESTDIR)$(mandir)/man1
	46
	47	clean:
	48	cd awka; $(MAKE) clean
	49	diff -Nru awka-0.7.0/awka/Makefile.in awka-0.7.0.new/awka/Makefile.in
19bdfa7c	50	--- awka-0.7.0/awka/Makefile.in Fri Aug 11 15:49:46 2000
	51	+++ awka-0.7.0.new/awka/Makefile.in Fri Aug 11 15:50:34 2000
	52	@@ -14,17 +14,15 @@
	53
	54	YACC = @YACC@
	55	AWK = @AWK@
	56	+LDFLAGS = @LDFLAGS@
	57
	58	# where to put awka
60d29e1d	59	prefix = @prefix@
	60	exec_prefix = @exec_prefix@
	61
	62	-BINDIR = @bindir@
	63	-LIBDIR = @libdir@
	64	-INCDIR = @includedir@
	65	-# where to put the man pages
	66	-MANDIR = @mandir@
	67	-MANEXT = @MANEXT@
	68	+bindir = @bindir@
	69	+libdir = @libdir@
	70	+includedir = @includedir@
	71	#######################################
	72
	73	MAKEFILEIN = Makefile.in
19bdfa7c	74	@@ -40,7 +38,7 @@
	75	cd ..; /bin/sh ./config.status
	76
	77	awka : $(OBJS)
	78	- $(CC) $(CFLAGS) $(OBJS) -o awka
	79	+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o awka
	80
	81	parse.c : parse.y
	82	@echo expect 6 shift/reduce conflicts
	83	@@ -51,8 +49,8 @@
60d29e1d	84	else mv y.tab.h parse.h ; fi
	85
	86	install : awka
	87	- cp awka$(EXE) $(BINDIR)
	88	- chmod a+rx $(BINDIR)/awka$(EXE)
	89	+ cp awka$(EXE) $(DESTDIR)$(bindir)
	90	+ chmod a+rx $(DESTDIR)$(bindir)/awka$(EXE)
	91
	92	clean :
	93	rm -f *.o core awka awka$(EXE)
	94	diff -Nru awka-0.7.0/dfa/Makefile.in awka-0.7.0.new/dfa/Makefile.in
19bdfa7c	95	--- awka-0.7.0/dfa/Makefile.in Fri Aug 11 15:49:46 2000
60d29e1d	96	+++ awka-0.7.0.new/dfa/Makefile.in Fri Aug 11 15:18:34 2000
	97	@@ -18,12 +18,9 @@
	98	prefix = @prefix@
	99	exec_prefix = @exec_prefix@
	100
	101	-BINDIR = @bindir@
	102	-LIBDIR = @libdir@
	103	-INCDIR = @includedir@
	104	-# where to put the man pages
	105	-MANDIR = @mandir@
	106	-MANEXT = @MANEXT@
	107	+bindir = @bindir@
	108	+libdir = @libdir@
	109	+includedir = @includedir@
	110	BUILDLIB = libdfa.@BUILDLIB@
	111	#######################################
	112
	113	@@ -46,11 +43,11 @@
	114	$(CC) -shared $(CFLAGS) $(LOBJS) -o libdfa.so
	115
	116	install : libdfa.a
	117	- cp libdfa.a $(LIBDIR)
	118	- if [ -f libdfa.so ]; then cp libdfa.so $(LIBDIR); fi
	119	- cp dfa.h $(INCDIR)
	120	- chmod a+r $(LIBDIR)/libdfa.*
	121	- chmod a+r $(INCDIR)/dfa.h
	122	+ cp libdfa.a $(DESTDIR)$(libdir)
	123	+ if [ -f libdfa.so ]; then cp libdfa.so $(DESTDIR)$(libdir); fi
	124	+ cp dfa.h $(DESTDIR)$(includedir)
	125	+ chmod a+r $(DESTDIR)$(libdir)/libdfa.*
	126	+ chmod a+r $(DESTDIR)$(includedir)/dfa.h
	127
	128	clean :
	129	rm -f *.o core libdfa.a libdfa.so
	130	diff -Nru awka-0.7.0/lib/Makefile.in awka-0.7.0.new/lib/Makefile.in
19bdfa7c	131	--- awka-0.7.0/lib/Makefile.in Fri Aug 11 15:49:46 2000
60d29e1d	132	+++ awka-0.7.0.new/lib/Makefile.in Fri Aug 11 15:18:19 2000
	133	@@ -18,12 +18,9 @@
	134	prefix = @prefix@
	135	exec_prefix = @exec_prefix@
	136
	137	-BINDIR = @bindir@
	138	-LIBDIR = @libdir@
	139	-INCDIR = @includedir@
	140	-# where to put the man pages
	141	-MANDIR = @mandir@
	142	-MANEXT = @MANEXT@
	143	+bindir = @bindir@
	144	+libdir = @libdir@
	145	+includedir = @includedir@
	146	BUILDLIB = libawka.@BUILDLIB@
	147	#######################################
	148
	149	@@ -56,11 +53,11 @@
	150	$(AWK) -f ../examples/fixhdr.awk libawka.h.in >libawka.h
	151
	152	install : libawka.a
	153	- cp libawka.a $(LIBDIR)
	154	- if [ -f libawka.so ]; then cp libawka.so $(LIBDIR); fi
	155	- cp libawka.h $(INCDIR)
	156	- chmod a+r $(LIBDIR)/libawka.*
	157	- chmod a+r $(INCDIR)/libawka.h
	158	+ cp libawka.a $(DESTDIR)$(libdir)
	159	+ if [ -f libawka.so ]; then cp libawka.so $(DESTDIR)$(libdir); fi
	160	+ cp libawka.h $(DESTDIR)$(includedir)
	161	+ chmod a+r $(DESTDIR)$(libdir)/libawka.*
	162	+ chmod a+r $(DESTDIR)$(includedir)/libawka.h
	163
	164	clean :
	165	rm -f .o ../regexp/.o ../regexp/.done core libawka.a libawka.so libawka.h