[gnome-shell] Makefile.am: Use global substitutions



commit d1d414205259cd33f7b4cf11a971925f570db4b7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jan 18 19:39:11 2012 -0500

    Makefile.am: Use global substitutions
    
    This allows us to make more than one of the same replacement in a .in file
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668429

 src/Makefile.am |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index fa6c4b5..6ec1f06 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,15 +48,15 @@ uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/gnome-shell
 
 generated_script_substitutions = \
-	    -e "s|@bindir[ ]|$(bindir)|" \
-	    -e "s|@datadir[ ]|$(datadir)|" \
-	    -e "s|@libexecdir[ ]|$(libexecdir)|" \
-	    -e "s|@libdir[ ]|$(libdir)|" \
-	    -e "s|@JHBUILD_TYPELIBDIR[ ]|$(JHBUILD_TYPELIBDIR)|" \
-	    -e "s|@pkgdatadir[ ]|$(pkgdatadir)|" \
-	    -e "s|@PYTHON[ ]|$(PYTHON)|" \
-	    -e "s|@VERSION[ ]|$(VERSION)|" \
-	    -e "s|@sysconfdir[ ]|$(sysconfdir)|"
+	    -e "s|@bindir[ ]|$(bindir)|g" \
+	    -e "s|@datadir[ ]|$(datadir)|g" \
+	    -e "s|@libexecdir[ ]|$(libexecdir)|g" \
+	    -e "s|@libdir[ ]|$(libdir)|g" \
+	    -e "s|@JHBUILD_TYPELIBDIR[ ]|$(JHBUILD_TYPELIBDIR)|g" \
+	    -e "s|@pkgdatadir[ ]|$(pkgdatadir)|g" \
+	    -e "s|@PYTHON[ ]|$(PYTHON)|g" \
+	    -e "s|@VERSION[ ]|$(VERSION)|g" \
+	    -e "s|@sysconfdir[ ]|$(sysconfdir)|g"
 
 gnome-shell-jhbuild: gnome-shell-jhbuild.in gnome-shell-real Makefile
 	$(AM_V_GEN) sed $(generated_script_substitutions) $< > $  tmp && mv $  tmp $@ && chmod a+x $@



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]