[stunnel-users] bugfix for the makefile of stunnel 4.07

Tue Jan 4 11:52:52 CET 2005

Hi,

there appears to be a bug in the makefile (tools/Makefile) that
installed files/directories in the wrong place when installing to
another root directory (DESTDIR env var)

The attached patch should fix it.

greets,
-- Steven Van Acker
-------------- next part --------------
diff -Naur stunnel-4.07/tools/Makefile.am stunnel-4.07-patched/tools/Makefile.am

--- stunnel-4.07/tools/Makefile.am	2004-10-14 16:12:34.000000000 +0200
+++ stunnel-4.07-patched/tools/Makefile.am	2005-01-04 11:37:05.000000000 +0100
@@ -13,13 +13,13 @@
 	stunnel.spec stunnel.init
 
 install-data-local:
-	mkdir -p $(localstatedir)/stunnel
-	-chmod a=rwx,+t $(localstatedir)/stunnel
+	mkdir -p $(DESTDIR)$(localstatedir)/stunnel
+	-chmod a=rwx,+t $(DESTDIR)$(localstatedir)/stunnel
 	-uname | grep SunOS && \
-		mkdir -p $(localstatedir)/stunnel/dev && \
-		chmod u=rwx,go=rx $(localstatedir)/stunnel/dev && \
-		mknod $(localstatedir)/stunnel/dev/zero c 13 12 && \
-		chmod a=rw $(localstatedir)/stunnel/dev/zero
+		mkdir -p $(DESTDIR)$(localstatedir)/stunnel/dev && \
+		chmod u=rwx,go=rx $(DESTDIR)$(localstatedir)/stunnel/dev && \
+		mknod $(DESTDIR)$(localstatedir)/stunnel/dev/zero c 13 12 && \
+		chmod a=rw $(DESTDIR)$(localstatedir)/stunnel/dev/zero
 
 openssl=$(ssldir)/bin/openssl
 stunnel.pem: stunnel.cnf
diff -Naur stunnel-4.07/tools/Makefile.in stunnel-4.07-patched/tools/Makefile.in
--- stunnel-4.07/tools/Makefile.in	2004-12-30 12:57:40.000000000 +0100
+++ stunnel-4.07-patched/tools/Makefile.in	2005-01-04 11:37:26.000000000 +0100
@@ -380,13 +380,13 @@
 
 
 install-data-local:
-	mkdir -p $(localstatedir)/stunnel
-	-chmod a=rwx,+t $(localstatedir)/stunnel
+	mkdir -p $(DESTDIR)$(localstatedir)/stunnel
+	-chmod a=rwx,+t $(DESTDIR)$(localstatedir)/stunnel
 	-uname | grep SunOS && \
-		mkdir -p $(localstatedir)/stunnel/dev && \
-		chmod u=rwx,go=rx $(localstatedir)/stunnel/dev && \
-		mknod $(localstatedir)/stunnel/dev/zero c 13 12 && \
-		chmod a=rw $(localstatedir)/stunnel/dev/zero
+		mkdir -p $(DESTDIR)$(localstatedir)/stunnel/dev && \
+		chmod u=rwx,go=rx $(DESTDIR)$(localstatedir)/stunnel/dev && \
+		mknod $(DESTDIR)$(localstatedir)/stunnel/dev/zero c 13 12 && \
+		chmod a=rw $(DESTDIR)$(localstatedir)/stunnel/dev/zero
 stunnel.pem: stunnel.cnf
 	if test -r "$(RANDOM_FILE)"; \
 		then dd if="$(RANDOM_FILE)" of=stunnel.rnd bs=256 count=1; \
