[Wesnoth-cvs-commits] wesnoth Makefile.am

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/05/22 21:39:07

Modified files:
        .              : Makefile.am 

Log message:
        install does not necessarily support -D, use mkdir_p instead

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.35 wesnoth/Makefile.am:1.36
--- wesnoth/Makefile.am:1.35    Sun May 22 13:06:21 2005
+++ wesnoth/Makefile.am Sun May 22 21:39:06 2005
@@ -8,12 +8,15 @@
 
 if LITE
 findmoredata=;find images $(findfilterflags) -o -path 
"images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" -o -print
+findmoredatadirs=find images -type d -not \( -name CVS -prune -o -path 
"images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print
 else
 findmoredata=;find images music $(findfilterflags) -o -print
+findmoredatadirs=find images music -type d -not \( -name CVS -prune \) -print
 endif
 
 finddata=(cd $(top_srcdir) && find data fonts sounds $(findfilterflags) -o 
-print \
         $(findmoredata) )
+finddatadirs=(cd $(top_srcdir) && find data fonts sounds -type d -not \( -name 
CVS -prune \) -print; $(findmoredatadirs) )
 findnoinst=(cd $(top_srcdir) && find utils -name CVS -prune -o -name ".cvs*" 
-o -name ".\#*" -o -type d -o -print && find MANUAL*)
 
 w_preparefileinstall = if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -27,10 +30,13 @@
 if INSTALLDATA
        test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
        srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       ( $(finddatadirs) ) | while read p; do \
+         $(mkdir_p) "$$p"; \
+       done
        ( $(finddata) ) | while read p; do \
          $(w_preparefileinstall) \
-         echo $(INSTALL_DATA) -D "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-         $(INSTALL_DATA) -D "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+         echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+         $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
        done
 if DUMMYLOCALES
        $(mkdir_p) "$(DESTDIR)$(pkgdatadir)/locales"