mail[Wesnoth-commits] r20605 - in /trunk: Makefile.am doc/manual/Makefile.am


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by jorda on September 19, 2007 - 23:00:
Author: jorda
Date: Wed Sep 19 22:59:43 2007
New Revision: 20605

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20605&view=rev
Log:
Manual install/uninstall.

Modified:
    trunk/Makefile.am
    trunk/doc/manual/Makefile.am

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/Makefile.am?rev=20605&r1=20604&r2=20605&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Wed Sep 19 22:59:43 2007
@@ -21,7 +21,11 @@
 finddata=(cd $(top_srcdir) && find data fonts sounds $(findfilterflags) -o 
-print \
         $(findmoredata) )
 finddatadirs=(cd $(top_srcdir) && find data fonts sounds -type d \! \( -name 
.svn -prune \) -print; $(findmoredatadirs) )
-findnoinst=(cd $(top_srcdir) && find utils -name .svn -prune -o -name ".\#*" 
-o -type d -o -print && find MANUAL* && find doc/manual -name "*.html" && 
find doc/manual/images -name "*.jpg" && find doc/manual/images -name "*.png")
+findnoinst=(cd $(top_srcdir) && find utils -name .svn -prune -o -name ".\#*" 
-o -type d -o -print && find MANUAL* )
+
+finddocdist=(cd $(top_srcdir) && find doc/manual -name "*.html" -o -name 
"*.css" -o -name "*.jpg" )
+finddoc=($(finddocdist) | sed -e 's:doc/manual:manual:g' )
+finddocdirs=(cd $(top_srcdir)/doc && find manual -type d \! \( -name .svn 
-prune \) -print; )
 
 w_preparefileinstall = if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          case $$p in \
@@ -66,6 +70,15 @@
          $(w_preparefileinstall) \
          echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
          $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+       done
+       test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+       ( $(finddocdirs) ) | while read p; do \
+         $(mkdir_p) "$(DESTDIR)$(docdir)/$$p"; \
+       done; \
+       ( $(finddoc) ) | while read p; do \
+         cd doc && $(w_preparefileinstall) \
+         echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+         $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
        done
 if DUMMYLOCALES
        $(mkdir_p) "$(DESTDIR)$(pkgdatadir)/locales"
@@ -108,11 +121,23 @@
          echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
          rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
        done
+       ( $(finddoc) ) | while read p; do \
+         case $$p in \
+           $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+           *) f=$$p;; \
+         esac; \
+         echo " rm -f '$(DESTDIR)$(docadir)/$$f'"; \
+         rm -f "$(DESTDIR)$(docdir)/$$f"; \
+       done
+       ( $(finddocdirs) | sed -e 's/ /\n/g' | sort -r ) | while read p; do \
+         d=$(DESTDIR)$(docdir)/$$p && \
+         if test -d $$d ; then echo "rmdir $$d"; echo `rmdir $$d` ; fi \
+       done
 endif
 
 dist-hook:
        srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       ( $(finddata); $(findnoinst) ) | (cd $(top_srcdir) && tar cf - -T -) 
| (cd $(distdir) && tar xf -)
+       ( $(finddata); $(finddocdist); $(findnoinst) ) | (cd $(top_srcdir) && 
tar cf - -T -) | (cd $(distdir) && tar xf -)
 
 dist_noinst_DATA = copyright changelog players_changelog wesnoth.dev 
editor.dev server.dev wesnoth.kdevelop campaign_server.dsp map_editor.dsp 
server.dsp wesnoth.dsp wesnoth.dsw
 
@@ -121,6 +146,7 @@
        if test -d $(bindir) ; then echo `rmdir $(bindir)` ; fi
        if test -d $(datadir) ; then echo `rmdir $(datadir)` ; fi
        if test -d $(prefix) ; then echo `rmdir $(prefix)` ; fi
+       if test -d $(docdir) ; then echo `rmdir $(docdir)` ; fi
 
 clean-local:
        rm -rf translations po/stamp* po/*/stamp*

Modified: trunk/doc/manual/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/doc/manual/Makefile.am?rev=20605&r1=20604&r2=20605&view=diff
==============================================================================
--- trunk/doc/manual/Makefile.am (original)
+++ trunk/doc/manual/Makefile.am Wed Sep 19 22:59:43 2007
@@ -1,6 +1,4 @@
 if MANUALUPDATE
-dist_noinst_DATA = styles/manual.css
-
 XSLTOPTS = --nonet \
   --stringparam callout.graphics 0 \
   --stringparam navig.graphics 0 \




Related Messages


Powered by MHonArc, Updated Thu Sep 20 02:00:49 2007