Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23223
Modified Files:
Makefile Makefile.defs
Log Message:
Fix bug #1151175: make SUFF= failures.
Index: Makefile.defs
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile.defs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.defs 15 Feb 2005 19:32:37 -0000 1.1
+++ Makefile.defs 24 Feb 2005 17:26:18 -0000 1.2
@@ -1,4 +1,10 @@
+# SUFF is the versioning suffix added to binaries and resource files.
+# To get rid of it (and do a non-versionned install, for example), do:
+# make whatever SUFF=
+
+SUFF ?=-$(VER)
+
VER = 1.2
# SETUP.
@@ -10,15 +16,18 @@
BASE_DIR = /usr
BASE_DIR_ARCH = $(BASE_DIR)
+FLEXML= flexml$(SUFF)
+FLEXML_ACT = flexml-act$(SUFF)
+
BINDIR = $(BASE_DIR_ARCH)/bin
LIBDIR = $(BASE_DIR_ARCH)/lib
SHARE = $(BASE_DIR)/share
MAN1DIR = $(SHARE)/man/man1
-DOCDIR = $(SHARE)/doc/flexml-$(VER)
-DATADIR = $(SHARE)/flexml-$(VER)
+DOCDIR = $(SHARE)/doc/$(FLEXML)
+DATADIR = $(SHARE)/$(FLEXML)
TMPDIR = /var/tmp
-ACT = $(LIBDIR)/flexml-act-$(VER)
+ACT = $(LIBDIR)/$(FLEXML_ACT)
SKEL = $(DATADIR)/skel
# Permanent program locations
Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile 23 Feb 2005 23:32:56 -0000 1.34
+++ Makefile 24 Feb 2005 17:26:18 -0000 1.35
@@ -20,20 +20,18 @@
# $Id$
-
-# SUFF is the versionning suffix added to binaries and resource files.
-# To get rid of it (and do a non-versionned install, for example), do:
+# SUFF (defined in Makefile.defs) is the versioning suffix added to binaries and
+# resource files. To get rid of it (and do a non-versioned install,
+# for example), do:
# make whatever SUFF=
-SUFF ?=-$(VER)
-
# FILES.
include Makefile.defs
STUFF = GPL Makefile Makefile.defs flexml.pl FleXML.html
-BINS = flexml$(SUFF)
-LIBS = flexml-act$(SUFF)
+BINS = $(FLEXML)
+LIBS = $(FLEXML_ACT)
DATA = skel
MANS = flexml.1
DOCS = README NOTES TODO flexml-act.dtd EnlargeFlex.patch
@@ -61,25 +59,28 @@
install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
rm -f $(DESTDIR)$(BINDIR)/flexml
- test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/flexml$(SUFF) $(DESTDIR)$(BINDIR)/flexml
+ test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/$(FLEXML) $(DESTDIR)$(BINDIR)/flexml
make -C examples install
+# This should probably be something different
+FLEXML_DIR = $(FLEXML)
+
dist: clean
@echo "Building distribution..."
- mkdir flexml$(SUFF)/
+ mkdir $(FLEXML_DIR)
cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) flexml-act-bootstrap.c \
- 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)/
+ $(FLEXML_DIR)
+ cp -r examples $(FLEXML_DIR)
+ find $(FLEXML_DIR) -name CVS | xargs rm -rf
+ find $(FLEXML_DIR) -name .cvsignore | xargs rm -rf
+ tar cvfz $(FLEXML_DIR).tar.gz $(FLEXML_DIR)
+ rm -rf $(FLEXML_DIR)
#rsync -v FleXML.html $(WEBHOME)/FleXML.html
#rsync -va --cvs-exclude --delete-excluded ./ $(FTPHOME)/
clean::; @echo "Cleaning..."
- $(RM) -rf flexml$(SUFF).tar.gz flexml$(SUFF)/
+ $(RM) -rf $(FLEXML_DIR).tar.gz $(FLEXML_DIR)
$(RM) *.[olh1] *-dummy.? lex.* *~ ./#*
find -name '*~' | xargs $(RM)
test:: all
@@ -108,9 +109,9 @@
# MAIN PROGRAM.
-clean::; $(RM) flexml$(SUFF) flexml-act$(SUFF) flexml-act flexml-act.c
+clean::; $(RM) $(FLEXML) $(FLEXML_ACT) flexml-act flexml-act.c
-flexml$(SUFF): flexml.pl
+$(FLEXML): flexml.pl
sed \
-e "s;[.][/]flexml-act;$(ACT);g" \
-e "s;[.][/]skel;$(SKEL);g" \
@@ -118,8 +119,10 @@
-e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl > $@
chmod +x $@
-flexml-act$(SUFF): flexml-act
+ifneq ($(SUFF),)
+$(FLEXML_ACT): flexml-act
cp flexml-act $@
+endif
# Action language...
flexml-act.l: flexml-act.dtd
@@ -140,11 +143,11 @@
clean::; $(RM) flexml.html index.html pod2html-*
-flexml.1: flexml$(SUFF)
- $(POD2MAN) flexml$(SUFF) > $@
+flexml.1: $(FLEXML)
+ $(POD2MAN) $(FLEXML) > $@
-flexml.html: flexml$(SUFF)
- $(POD2HTML) < flexml$(SUFF) > $@
+flexml.html: $(FLEXML)
+ $(POD2HTML) < $(FLEXML) > $@
index.html: FleXML.html
sed 's.ftp/FleXML/..g' FleXML.html > $@
|
