You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2010/09/19 23:54:31 UTC
svn commit: r998739 - in /tcl/rivet/branches/2_0: ./ ChangeLog debian/compat
debian/files debian/install debian/rules debian/substvars doc/Makefile.am
Author: mxmanghi
Date: Sun Sep 19 21:54:30 2010
New Revision: 998739
URL: http://svn.apache.org/viewvc?rev=998739&view=rev
Log:
new scripts in branches/2_0/debian/
Added:
tcl/rivet/branches/2_0/debian/compat
- copied unchanged from r998676, tcl/rivet/trunk/debian/compat
tcl/rivet/branches/2_0/debian/files
- copied unchanged from r998676, tcl/rivet/trunk/debian/files
tcl/rivet/branches/2_0/debian/install
- copied unchanged from r998676, tcl/rivet/trunk/debian/install
tcl/rivet/branches/2_0/debian/substvars
- copied unchanged from r998676, tcl/rivet/trunk/debian/substvars
Modified:
tcl/rivet/branches/2_0/ (props changed)
tcl/rivet/branches/2_0/ChangeLog
tcl/rivet/branches/2_0/debian/rules
tcl/rivet/branches/2_0/doc/Makefile.am
Propchange: tcl/rivet/branches/2_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 19 21:54:30 2010
@@ -1 +1 @@
-/tcl/rivet/trunk:939332-998073
+/tcl/rivet/trunk:939332-998676
Modified: tcl/rivet/branches/2_0/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/ChangeLog?rev=998739&r1=998738&r2=998739&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/ChangeLog (original)
+++ tcl/rivet/branches/2_0/ChangeLog Sun Sep 19 21:54:30 2010
@@ -1,3 +1,6 @@
+2010-09-18 Massimo Manghi <mx...@apache.org>
+ * debian/*: files modified and added in the process to build a debian package
+ * doc/Makefile.am: comments added. Better target handling
2010-09-15 Massimo Manghi <mx...@apache.org>
* debian/README.Debian, debian/rivet.load: add files needed to build a Debian package
Modified: tcl/rivet/branches/2_0/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/rules?rev=998739&r1=998738&r2=998739&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/rules (original)
+++ tcl/rivet/branches/2_0/debian/rules Sun Sep 19 21:54:30 2010
@@ -41,13 +41,7 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-# cp debian/rivet.load debian/tmp/etc/apache2/mods-available/
-# (cd debian/tmp/etc/apache2/mods-enabled/ ; ln -s ../mods-available/rivet.load)
-# cp debian/rivet.conf debian/tmp/etc/apache2/mods-available/
-# (cd debian/tmp/etc/apache2/mods-enabled/ ; ln -s ../mods-available/rivet.conf)
-# cp debian/500mod_rivet.info debian/tmp/`apxs -q LIBEXECDIR`/500mod_rivet.info
-# cp debian/rivet.conf debian/tmp/etc/apache/conf.d/rivet.conf
binary-indep: build install
@@ -58,7 +52,7 @@ binary-arch: build install
dh_installchangelogs ChangeLog
dh_installdocs doc/*
dh_installexamples
-# dh_install
+ dh_install
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
Modified: tcl/rivet/branches/2_0/doc/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/Makefile.am?rev=998739&r1=998738&r2=998739&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/Makefile.am (original)
+++ tcl/rivet/branches/2_0/doc/Makefile.am Sun Sep 19 21:54:30 2010
@@ -35,29 +35,41 @@ html/rivet.html: rivet.xml rivet-nochunk
# This means these are not build automatically, but at least
# people aren't forced to build them either.
-docs: mandirs graphics html/rivet.css html/index.html
+docs: picts html/rivet.css html/index.html
docs-nochunk: html/rivet.html
html/rivet.css: mandirs rivet.css
cp -v rivet.css html/
-graphics: mandirs $(PICTURES)
+
+# target picts checks the directory tree exists, then lets target 'graphics' copy new
+# or updated files to the target tree.
+
+picts: mandirs graphics
+
+graphics: $(PICTURES)
for gfile in $?; do \
cp -v $$gfile html/images/ ; \
done ; \
touch graphics
+# target that builds the essential directory tree that will get the html and
+# graphic files of the manual
+
mandirs: $(MANDIRS)
$(MANDIRS):
- mkdir $@
+ mkdir $@
+
+# this target cleans everything up in the html directory
clean:
-rm html/*.html
-rm html/*.css
-rm html/images/*.*
+ -rmdir html/images
+ -rmdir html
if [ -e graphics ]; then \
rm graphics ; \
fi
-
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org