proposed patch to install cleanly

Makefile.in-fix-destdir.patch (text/plain), 1.93 KB, created by j.habenicht on 2009-12-23 09:41:01 UTC

diff -ur libcgi-1.0.old/Makefile.in libcgi-1.0/Makefile.in
--- libcgi-1.0.old/Makefile.in	2003-12-05 12:28:43.000000000 +0100
+++ libcgi-1.0/Makefile.in	2009-12-22 17:19:52.000000000 +0100
@@ -5,10 +5,13 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-SHAREDOPT = -shared
-LIBDIR = $(prefix)/lib
-INCDIR = $(prefix)/include
-MANDIR	= $(prefix)/man/man3
+SHAREDOPT = -shared -Wl,-soname=libcgi.so.1
+LIBDIR = @libdir@
+INCDIR = @includedir@
+MANDIR	= @mandir@
+#LIBDIR = $(prefix)/lib
+#INCDIR = $(prefix)/include
+#MANDIR	= $(prefix)/man/man3
 SHELL = /bin/sh
 EXTRA_LIBS = 
 
@@ -52,10 +55,10 @@
 	$(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
 
 install:
-	cp src/libcgi.a $(LIBDIR)
-	cp src/libcgi.so $(LIBDIR)
-	cp src/cgi.h $(INCDIR)
-	cp src/session.h $(INCDIR)
+	install -D src/libcgi.a $(DESTDIR)$(LIBDIR)/libcgi.a
+	install -D src/libcgi.so $(DESTDIR)$(LIBDIR)/libcgi.so
+	install -D src/cgi.h $(DESTDIR)$(INCDIR)/cgi.h
+	install -D src/session.h $(DESTDIR)$(INCDIR)/session.h
 
 
 src/error.o: src/error.c src/error.h
@@ -73,16 +76,16 @@
 	find src/ -name *.a -exec rm -f {} \;
 
 uninstall: clean
-	rm -f $(LIBDIR)/libcgi.*
-	rm -f $(INCDIR)/cgi.h
-	rm -f $(INCDIR)/session.h
-	rm -f $(MANDIR)/libcgi*
+	rm -f $(DESTDIR)$(LIBDIR)/libcgi.*
+	rm -f $(DESTDIR)$(INCDIR)/cgi.h
+	rm -f $(DESTDIR)$(INCDIR)/session.h
+	rm -f $(DESTDIR)$(MANDIR)/libcgi*
 
 install_man:
-	cp doc/man/man3/libcgi_base64.3 $(MANDIR)
-	cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
-	cp doc/man/man3/libcgi_general.3 $(MANDIR)
-	cp doc/man/man3/libcgi_string.3 $(MANDIR)
-	cp doc/man/man3/libcgi_session.3 $(MANDIR)
-	cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
+	cp doc/man/man3/libcgi_base64.3 $(DESTDIR)$(MANDIR)
+	cp doc/man/man3/libcgi_cgi.3 $(DESTDIR)$(MANDIR)
+	cp doc/man/man3/libcgi_general.3 $(DESTDIR)$(MANDIR)
+	cp doc/man/man3/libcgi_string.3 $(DESTDIR)$(MANDIR)
+	cp doc/man/man3/libcgi_session.3 $(DESTDIR)$(MANDIR)
+	cp doc/man/man3/libcgi_cookie.3 $(DESTDIR)$(MANDIR)