# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.87 2002/04/23 14:10:59 swa Exp $
+# $Id: GNUmakefile.in,v 1.90 2002/04/26 17:46:53 swa Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
#############################################################################
.PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
-install
+install conectiva-spec conectiva-dist conectiva-upload
#############################################################################
fi; \
done; \
-#############################################################################
-# redhat distribution alpha and x86
-#############################################################################
-redhat-dist: rpm-stuff
-
- $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
- if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
-
check-release:
@if [ "$(RPM_PACKAGEV)" = "" ]; then \
echo ; \
echo " No value given for RPM_PACKAGEV. Please use:"; \
echo " make dist-upload RPM_PACKAGEV=release"; \
echo " where \"release\" is the release number you want to and"; \
- echo " where \"dist\" is the name of the distro \(redhat or suse\)"; \
+ echo " where \"dist\" is the name of the distro (redhat or suse)"; \
echo ; \
echo " Ex: make redhat-upload RPM_PACKAGEV=1"; \
+ echo ""; \
+ echo "ATTENTION: If your distribution use a specific tag on the"; \
+ echo " release field (like \"cl\" for Conectiva, and"; \
+ echo " \"mdk\" for Mandrake), DO NOT put it on the value"; \
+ echo " given to RPM_PACKAGEV. It will be added automaticaly."; \
+ echo " Do it like you would do for a redhat package,"; \
+ echo " (i.e. just the number)."; \
echo ; \
exit 1; \
fi
+
+#############################################################################
+# Create Conectiva specfile from RedHat specfile
+#############################################################################
+conectiva-spec:
+ rm -f privoxy-cl.spec
+ chmod a+x genclspec.sh
+ ./genclspec.sh
+
+#############################################################################
+# Conectiva distribution for x86
+#############################################################################
+conectiva-dist: rpm-stuff conectiva-spec
+
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-rh.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+ $(RPM) --clean -ta $(TAR_ARCH)
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+
+conectiva-upload: check-release
+ make redhat-upload RPM_PACKAGEV=$(RPM_PACKAGEV)cl
+
+#############################################################################
+# redhat distribution alpha and x86
+#############################################################################
+redhat-dist: rpm-stuff
+
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+ $(RPM) --clean -ta $(TAR_ARCH)
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+
# anonymously ncftps the rpms to sourceforge
redhat-upload: check-release
ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
exit 1;\
fi
- $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) .
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
$(RPM) --clean -ta $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
doc/webserver/index.html && rm -f doc/source/webserver/*.bak
# Main documentation target.
-dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver authors
+dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
# kludge to force recreation on next run. Rodgrigo?
@rm -f doc/source/ldpOK.dsl
@$(ECHO) Documentation created.
#
# an alternative to the above dok. disabled man page creation for the moment
#
-redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver authors
+redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver dok-authors
# kludge to force recreation on next run. Rodgrigo?
@rm -f doc/source/ldpOK.dsl
@$(ECHO) Documentation created.
@rm -f doc/source/ldpOK.dsl
## Make AUTHORS file
-authors: doc/source/ldpOK.dsl
+dok-authors: doc/source/ldpOK.dsl
cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
tmp.html > ../../AUTHORS && rm -f tmp.html
# kludge to force recreation on next run. Rodgrigo?
cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf
rm -f doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
+# the layout and style with db2pdf sucks, here is an alternative
+dok-pdf2: doc/source/ldpOK.dsl dok-release
+ mkdir -p doc/source/temp # this directory not in cvs
+ cd doc/source && $(DB) -V nochunks user-manual.sgml > temp/privoxy-user-manual.html
+ cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
+ cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
+# one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
+
#############################################################################
#
# Webserver
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.90 2002/04/26 17:46:53 swa
+# be consistent
+#
+# Revision 1.89 2002/04/26 17:20:54 swa
+# just produce single html files to proces them later with Destiller or somesuch. looks prettier.
+#
+# Revision 1.88 2002/04/25 19:13:57 morcego
+# Removed RPM release number declaration on configure.in
+# Changed makefile to use given value for RPM_PACKAGEV when on uploading
+# targets (will produce an error, explaining who to do it, if no value
+# if provided).
+#
# Revision 1.87 2002/04/23 14:10:59 swa
# now create pdf documents
#