X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=09213832a3a9861ea20a30d8d4ae88c52f5fa2d8;hb=19ca6a894e4487edef033586a6d32693d72826fb;hp=e72353f739bdb62886440ccc7eb7692b0751814f;hpb=8be1c2728215eee375b6fab69d80ea851693704a;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e72353f7..09213832 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.42 2002/03/29 06:59:04 swa Exp $
+# $Id: GNUmakefile.in,v 1.45 2002/03/29 19:45:45 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -51,9 +51,10 @@ RPM_PACKAGEV  = @VERSION_RPM_PACKAGE@
 # Directories for "make install"
 #############################################################################
 
-DEST        = @sysconfdir@/privoxy
-SBIN_DEST   = @sbindir@
-MAN_DEST    = @mandir@
+DEST        = @prefix@
+CONFDEST    = @prefix@@sysconfdir@
+SBIN_DEST   = @prefix@@sbindir@
+MAN_DEST    = @prefix@@mandir@
 
 
 #############################################################################
@@ -64,7 +65,11 @@ PROGRAM    = privoxy@EXEEXT@
 CC         = @CC@
 ECHO       = echo
 GZIP_PROG  = gzip
-INSTALL    = cp -f
+#INSTALL    = cp -f
+INSTALL    = @INSTALL@
+INSTALL_P  = -m 0750 -g @GROUP@ -o @USER@ -b
+INSTALL_T  = -m 0640 -g @GROUP@ -o @USER@ -b
+INSTALL_D  = -m 0750 -g @GROUP@ -o @USER@ -d
 LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
@@ -73,7 +78,6 @@ CAT        = cat
 RPM        = rpm
 MV	   = mv
 TAR        = tar
-MAKE       = make
 LN         = ln
 WDUMP      = @WDUMP@ -dump
 JADEBIN    = @JADEBIN@
@@ -84,6 +88,10 @@ MAN2HTML   = @MAN2HTML@
 G2H_CMD    = groff -mandoc -Thtml
 TARGET_OS  = @host@
 
+#User Group paras
+USER       = @USER@
+GROUP	   = @GROUP@
+
 # Program to do LF->CRLF
 #
 # The sed version should be the most portable, but it doesn't for for me,
@@ -285,14 +293,14 @@ gen-dist:
 	$(STRIP_PROG) $(PROGRAM)
 	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
 # add program
-	$(TAR) -C.. -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)
+	cd .. && $(TAR) -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)
 # add config files
 	for foo in $(CONFIG_FILES); do \
-		$(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \
+		cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \
 	done; 
 # add documentation
 	for foo in $(DOC_FILES); do \
-		$(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \
+		cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \
 	done; 
 # and zip the archive
 	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
@@ -440,7 +448,7 @@ win-dist:
 #############################################################################
 tarball-dist: clobber
 	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
-	$(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS)
+	cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS)
 	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
 	@$(ECHO) Tarball (without any binary) created.
 
@@ -559,6 +567,14 @@ webserver:
 	find doc/webserver -type d -exec chmod a+rx {} \;
 	cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
+webquick:
+	find doc/webserver -type f -exec chmod 664 {} \;
+# not sure if we need next line.swa.
+	chmod 775 doc/webserver/redirect.php
+	find doc/webserver -type d -exec chmod a+rx {} \;
+	cd doc/webserver/submit && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/submit
+
+
 #############################################################################
 # Source file dependencies
 #############################################################################
@@ -624,10 +640,10 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 	$(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 
 clean:
-	$(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster
+	$(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster config.log
 
 clobber: clean
-	$(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure
+	$(RM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure
 
 tags: $(SRCS) $(HDRS)
 	etags $(SRCS) $(HDRS)
@@ -639,15 +655,17 @@ install: all
 	#        to be fixed!
 	#
 	$(STRIP_PROG) $(PROGRAM)
-	$(INSTALL) $(PROGRAM) $(SBIN_DEST)
-	mkdir -p $(DEST)/user-manual
-	mkdir -p $(DEST)/templates
-	cp -r doc/webserver/user-manual $(DEST)
-	cp -r templates $(DEST)
-	$(INSTALL) config default.action default.filter trust $(DEST)
+	$(INSTALL) $(INSTALL_D) $(SBIN_DEST)
+	$(INSTALL) $(INSTALL_D) $(DEST)/user-manual
+	$(INSTALL) $(INSTALL_D) $(DEST)/templates
+	$(INSTALL) $(INSTALL_D) $(CONFDEST)
+	$(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST)
+	if [ -d "doc/webserver/user-manual" ]; then $(INSTALL) $(INSTALL_T) doc/webserver/user-manual $(DEST); fi
+	$(INSTALL) $(INSTALL_T) templates/[a-z]* $(DEST)/templates
+	$(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST)
 	# FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly
 	# FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz
-	$(INSTALL) privoxy.init /etc/init.d/privoxy
+	$(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy
 
 
 #############################################################################
@@ -657,6 +675,15 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.45  2002/03/29 19:45:45  swa
+# for lazy swa
+#
+# Revision 1.44  2002/03/29 17:42:44  gliptak
+# Correcting for Solaris tar limitations
+#
+# Revision 1.43  2002/03/29 07:40:03  swa
+# fixed make webserver. doh
+#
 # Revision 1.42  2002/03/29 06:59:04  swa
 # other users could not modify files on webserver
 #