Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16195
Modified Files:
Makefile Makefile.defs
Log Message:
Makefiles use INSTALL and MAKE variables, that play
better with automatic build systems.
Index: Makefile.defs
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile.defs,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.defs 15 Sep 2006 19:58:31 -0000 1.15
+++ Makefile.defs 29 Sep 2006 19:00:18 -0000 1.16
@@ -45,6 +45,8 @@
CFLAGS = -O2 -g
#FLEXDEBUG = -d
+INSTALL ?= install
+
# Web location.
WEBHOME = info:public_html
Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile 18 Sep 2006 15:08:42 -0000 1.43
+++ Makefile 29 Sep 2006 19:00:17 -0000 1.44
@@ -52,17 +52,17 @@
$(DESTDIR)$(DATADIR) \
$(DESTDIR)$(DOCDIR)/html \
$(DESTDIR)$(DOCDIR)/examples
- install -m555 $(BINS) $(DESTDIR)$(BINDIR)/
- install -m555 $(LIBS) $(DESTDIR)$(LIBDIR)/
- install -m444 $(DATA) $(DESTDIR)$(DATADIR)/
- install -m444 $(MANS) $(DESTDIR)$(MAN1DIR)/
- install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
- install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
+ $(INSTALL) -m555 $(BINS) $(DESTDIR)$(BINDIR)/
+ $(INSTALL) -m555 $(LIBS) $(DESTDIR)$(LIBDIR)/
+ $(INSTALL) -m444 $(DATA) $(DESTDIR)$(DATADIR)/
+ $(INSTALL) -m444 $(MANS) $(DESTDIR)$(MAN1DIR)/
+ $(INSTALL) -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
+ $(INSTALL) -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
if test "x$(SUFF)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)/flexml; \
ln -s $(DESTDIR)$(BINDIR)/$(FLEXML) $(DESTDIR)$(BINDIR)/flexml;\
fi
- make -C examples install
+ $(MAKE) -C examples install
FLEXML_DISTDIR = $(FLEXML)-$(VER)
dist: test clean
@@ -131,9 +131,9 @@
# TESTS.
-clean::; make -C examples $@; make -C testbed $@
-test::; make -C examples $@; \
- make -C testbed $@ > test.out 2>&1; ! grep '^fail' test.out && \
+clean::; $(MAKE) -C examples $@; $(MAKE) -C testbed $@
+test::; $(MAKE) -C examples $@; \
+ $(MAKE) -C testbed $@ > test.out 2>&1; ! grep '^fail' test.out && \
echo "Tests succeeded."
|
