Changeset 608 for branches/stable

Timestamp:

10/10/13 10:47:24 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge forward Makefile fix/tweak from /trunk r607

Location:

branches/stable

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 diff)

branches/stable/Makefile

@@ -108 +108 @@
         mkdir $(PKGNAME)-$(VERSION)
         tar cf - $(MANIFEST) | (cd $(PKGNAME)-$(VERSION); tar xf -)
-        /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
-        /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
-        perl -pi -e 's/[\d.]+;\s*##VERSION##/$(VERSION);/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
+        /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/g;s/#RELEASE#/$(RELEASE)/g;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
+        /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/g;s/#RELEASE#/$(RELEASE)/g;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
+        perl -pi -e 's/[\d.]+;\s*##VERSION##/"$(VERSION)";/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
         tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)
         gzip -v -f -9 $(PKGNAME)-$(VERSION).tar