# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.38 2002/03/27 16:02:30 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/
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
+#############################################################################
+# Set make command correctly
+#############################################################################
+@SET_MAKE@
+
#############################################################################
# Version number (for RPM)
#############################################################################
# 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@
#############################################################################
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
RPM = rpm
MV = mv
TAR = tar
-MAKE = make
LN = ln
WDUMP = @WDUMP@ -dump
JADEBIN = @JADEBIN@
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,
$(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)
#############################################################################
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.
rm -rf doc/webserver/faq
cd doc/source && $(DB2HTML) -s ldpOK.dsl faq.sgml && mv faq ../webserver
cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq
- # kludge to force recreation on next run. Rodgrigo?
- rm -f doc/source/ldpOK.dsl
+## kludge to force recreation on next run. Rodgrigo?
+ @rm -f doc/source/ldpOK.dsl
man2html-swa:
mkdir -p doc/webserver/man-page
cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver
cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \
tmp.html > ../text/faq.txt && rm -rf tmp.html faq
- # kludge to force recreation on next run. Rodgrigo?
- rm -f doc/source/ldpOK.dsl
+## kludge to force recreation on next run. Rodgrigo?
+ @rm -f doc/source/ldpOK.dsl
doc/source/ldpOK.dsl:
cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \
fi
-# for those with good man2html output. RH7.x seems to work well.
+# For those with man2html ala RH7's.
man2html:
mkdir -p doc/webserver/man-page
if [ "$(MAN2HTML)" != "false" ]; then \
$(MAKE) groff2html; \
fi
-# Default, except for Redhat. Create html man page.
+# Otherwise we get plain groff conversion.
groff2html:
$(G2H_CMD) ./privoxy.1 > doc/webserver/man-page/privoxy-man-page.html
@$(ECHO) Note that this command scps all stuff to the webserver,
@$(ECHO) it will not remove obsolete documents.
@$(ECHO) -------------------------------------------------------
- chmod -R a+r doc/webserver
+ 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 && 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
#############################################################################
$(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)
# 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
#############################################################################
## 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
+#
+# Revision 1.41 2002/03/28 20:43:00 swa
+# set make correctly
+#
+# Revision 1.40 2002/03/28 04:22:44 hal9
+# More on man2html stuff.
+#
+# Revision 1.39 2002/03/28 01:04:14 hal9
+# More man2html stuff for docs.
+#
# Revision 1.38 2002/03/27 16:02:30 swa
# have a generic target
#
projects / privoxy.git / blobdiff