Changeset 607

Timestamp:

10/10/13 10:39:46 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Finally fix up the version-munging in the Makefile so that n.n.n versions
show up correctly. Fix a couple of other minor related nuisances as well.

File:

• trunk/Makefile (modified) (1 diff)

trunk/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