[Wesnoth-cvs-commits] wesnoth Makefile.am

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/05/23 19:53:03

Modified files:
        .              : Makefile.am 

Log message:
        fix three issues with latest build changes pointed out by silene, and 
another

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

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.38 wesnoth/Makefile.am:1.39
--- wesnoth/Makefile.am:1.38    Mon May 23 11:55:57 2005
+++ wesnoth/Makefile.am Mon May 23 19:53:03 2005
@@ -25,21 +25,21 @@
            *) f=$$p;; \
          esac;
 
-bundle_contents = "@address@hidden/Contents"
address@hidden@.app/Contents
 @address@hidden: src/@PACKAGE@
-       mkdir -p $(bundle_contents)/MacOS
-       mkdir -p $(bundle_contents)/Resources
-       echo "APPL????" > $(bundle_contents)/PkgInfo
+       mkdir -p "$(bundle_contents)/MacOS"
+       mkdir -p "$(bundle_contents)/Resources"
+       echo "APPL????" > "$(bundle_contents)/PkgInfo"
        $(INSTALL_PROGRAM) $< "$(bundle_contents)/MacOS/@PACKAGE_NAME@"
 
 install-data-local:
        @$(NORMAL_INSTALL)
 if INSTALLDATA
        test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-       srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        ( $(finddatadirs) ) | while read p; do \
-         test -d "$$p" || $(mkdir_p) "$$p"; \
-       done
+         $(mkdir_p) "$(DESTDIR)$(pkgdatadir)/$$p"; \
+       done; \
+       srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        ( $(finddata) ) | while read p; do \
          $(w_preparefileinstall) \
          echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \