summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1998-10-21 22:03:53 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1998-10-21 22:03:53 +0000
commit60399e3945dcfe9a2bb9f00f794d9e8634dd6bd9 (patch)
treeac9bd27e1f6ced2c67485e2c81ece2a3578dc8d1
parent2bc3c94ce572c4ab2fce8c0bff00ec61d2527e5a (diff)
Fixed install targets...
git-svn-id: file:///fltk/svn/fltk/trunk@51 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--Makefile6
-rw-r--r--src/Makefile9
-rw-r--r--test/Makefile7
3 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9d49a7828..93d41fec4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.5 1998/10/21 16:49:59 mike Exp $"
+# "$Id: Makefile,v 1.6 1998/10/21 22:03:51 mike Exp $"
#
# Top-level makefile for the Fast Light Tool Kit (FLTK).
#
@@ -36,7 +36,7 @@ all:
(cd $$dir;$(MAKE));\
done
-install: all
+install:
for dir in $(DIRS); do\
echo "=== installing $$dir ===";\
if test ! -f $$dir/makedepend; then\
@@ -62,5 +62,5 @@ clean:
done
#
-# End of "$Id: Makefile,v 1.5 1998/10/21 16:49:59 mike Exp $".
+# End of "$Id: Makefile,v 1.6 1998/10/21 22:03:51 mike Exp $".
#
diff --git a/src/Makefile b/src/Makefile
index ba9a72073..a2eb6ebff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.4 1998/10/21 14:20:37 mike Exp $"
+# "$Id: Makefile,v 1.5 1998/10/21 22:03:52 mike Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
@@ -174,12 +174,13 @@ include makedepend
install: ../lib/$(LIBNAME)
-mkdir -p $(libdir)
- cp -f ../lib/$(LIBNAME) $(libdir)
+ cp ../lib/$(LIBNAME) $(libdir)
@chmod a+r,u+w,g-w,o-w $(libdir)/$(LIBNAME)*
-mkdir -p $(includedir)
- cp -rf ../FL $(includedir)
+ -rm -rf $(includedir)/FL
+ cp -r ../FL $(includedir)
@chmod -R a+r,u+w,g-w,o-w $(includedir)/FL
#
-# End of "$Id: Makefile,v 1.4 1998/10/21 14:20:37 mike Exp $".
+# End of "$Id: Makefile,v 1.5 1998/10/21 22:03:52 mike Exp $".
#
diff --git a/test/Makefile b/test/Makefile
index cd331f1e3..b8f435851 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.10 1998/10/21 20:10:23 mike Exp $"
+# "$Id: Makefile,v 1.11 1998/10/21 22:03:53 mike Exp $"
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
@@ -110,6 +110,9 @@ depend:
clean:
-@ rm -f $(ALL) jpeg_image *.o core *~
+install:
+ @echo Nothing to install in test directory.
+
#
-# End of "$Id: Makefile,v 1.10 1998/10/21 20:10:23 mike Exp $".
+# End of "$Id: Makefile,v 1.11 1998/10/21 22:03:53 mike Exp $".
#