[Flexml-commits] flexml Makefile,1.32,1.33

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1726

Modified Files:
	Makefile 
Log Message:
First try to let versionned install and regular ones coexist in the same Makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile	15 Feb 2005 19:34:24 -0000	1.32
+++ Makefile	23 Feb 2005 23:23:11 -0000	1.33
@@ -22,11 +22,13 @@
 
 # FILES.
 
+SUFF ?=-$(VER)
+
 include Makefile.defs
 
 STUFF =	GPL Makefile Makefile.defs flexml.pl FleXML.html
-BINS  =	flexml-$(VER)
-LIBS  =	flexml-act-$(VER)
+BINS  =	flexml$(SUFF)
+LIBS  =	flexml-act$(SUFF)
 DATA  =	skel
 MANS  =	flexml.1
 DOCS  =	README NOTES TODO flexml-act.dtd EnlargeFlex.patch
@@ -54,25 +56,25 @@
 	install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
 	install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
 	rm -f $(DESTDIR)$(BINDIR)/flexml
-	ln -s $(DESTDIR)$(BINDIR)/flexml-$(VER) $(DESTDIR)$(BINDIR)/flexml
+	test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/flexml$(SUFF) $(DESTDIR)$(BINDIR)/flexml
 	make -C examples install
 
 dist:		clean
 	@echo "Building distribution..."
-	mkdir flexml-$(VER)/
+	mkdir flexml$(SUFF)/
 	cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) flexml-act-bootstrap.c \
-		flexml-$(VER)/
-	cp -r examples flexml-$(VER)/
-	find flexml-$(VER) -name CVS | xargs rm -rf
-	find flexml-$(VER) -name .cvsignore | xargs rm -rf
-	tar cvfz flexml-$(VER).tar.gz flexml-$(VER)
-	rm -rf flexml-$(VER)/
+		flexml$(SUFF)/
+	cp -r examples flexml$(SUFF)/
+	find flexml$(SUFF) -name CVS | xargs rm -rf
+	find flexml$(SUFF) -name .cvsignore | xargs rm -rf
+	tar cvfz flexml$(SUFF).tar.gz flexml$(SUFF)
+	rm -rf flexml$(SUFF)/
 
 	#rsync -v FleXML.html $(WEBHOME)/FleXML.html
 	#rsync -va --cvs-exclude --delete-excluded ./ $(FTPHOME)/
 
 clean::; @echo "Cleaning..."
-	$(RM) -rf flexml-$(VER).tar.gz flexml-$(VER)/
+	$(RM) -rf flexml$(SUFF).tar.gz flexml$(SUFF)/
 	$(RM) *.[olh1] *-dummy.? lex.* *~ ./#*
 	find -name '*~' | xargs $(RM)
 test::		all
@@ -101,9 +103,9 @@
 
 # MAIN PROGRAM.
 
-clean::; $(RM) flexml-$(VER) flexml-act-$(VER) flexml-act flexml-act.c
+clean::; $(RM) flexml$(SUFF) flexml-act$(SUFF) flexml-act flexml-act.c
 
-flexml-$(VER):		flexml.pl
+flexml$(SUFF):		flexml.pl
 	sed \
 	    -e "s;[.][/]flexml-act;$(ACT);g" \
 	    -e "s;[.][/]skel;$(SKEL);g" \
@@ -111,7 +113,7 @@
 	    -e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl > $@
 	chmod +x $@
 
-flexml-act-$(VER): flexml-act
+flexml-act$(SUFF): flexml-act
 	cp flexml-act $@
 
 # Action language...
@@ -133,11 +135,11 @@
 
 clean::; $(RM) flexml.html index.html pod2html-*
 
-flexml.1:	flexml-$(VER)
-	$(POD2MAN) flexml-$(VER) > $@
+flexml.1:	flexml$(SUFF)
+	$(POD2MAN) flexml$(SUFF) > $@
 
-flexml.html:	flexml-$(VER)
-	$(POD2HTML) < flexml-$(VER) > $@
+flexml.html:	flexml$(SUFF)
+	$(POD2HTML) < flexml$(SUFF) > $@
 
 index.html:	FleXML.html
 	sed 's.ftp/FleXML/..g' FleXML.html > $@