|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/library/Makefile.in.orig 2008-01-06 20:06:26.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/library/Makefile.in 2008-01-06 21:41:15.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -58,15 +58,15 @@
|
|
Michael Thomas |
b5a8ec1 |
for i in $(miscFiles) ; do \
|
|
Michael Thomas |
b5a8ec1 |
$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
|
|
Michael Thomas |
b5a8ec1 |
done
|
|
Michael Thomas |
b5a8ec1 |
- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
mkdirs:
|
|
Michael Thomas |
b5a8ec1 |
@for i in $(instdirs) ; do \
|
|
Michael Thomas |
b5a8ec1 |
if test -d $(INSTALL_ROOT)$$i ; then \
|
|
Michael Thomas |
b5a8ec1 |
: ; \
|
|
Michael Thomas |
b5a8ec1 |
else \
|
|
Michael Thomas |
b5a8ec1 |
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
- mkdir $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
+ mkdir -p $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
fi ; \
|
|
Michael Thomas |
b5a8ec1 |
done
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/configure.in.orig 2008-01-06 22:48:37.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/configure.in 2008-01-06 22:49:57.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -976,7 +976,9 @@
|
|
Michael Thomas |
b5a8ec1 |
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
# Add BLT to the run path
|
|
Michael Thomas |
b5a8ec1 |
-libdir=${exec_prefix}/lib
|
|
Michael Thomas |
b5a8ec1 |
+if test "x${libdir}" == "x" ; then
|
|
Michael Thomas |
b5a8ec1 |
+ libdir=${exec_prefix}/lib
|
|
Michael Thomas |
b5a8ec1 |
+fi
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
if test "x${libdir}" != "x" -a \
|
|
Michael Thomas |
b5a8ec1 |
"${libdir}" != "/usr/lib" -a \
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/demos/Makefile.in.orig 2008-01-06 20:11:25.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/demos/Makefile.in 2008-01-06 22:02:50.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -6,7 +6,7 @@
|
|
Michael Thomas |
b5a8ec1 |
exec_prefix = @exec_prefix@
|
|
Michael Thomas |
b5a8ec1 |
version = @BLT_VERSION@
|
|
Michael Thomas |
b5a8ec1 |
libdir = @libdir@
|
|
Michael Thomas |
b5a8ec1 |
-scriptdir = $(prefix)/lib/blt$(version)
|
|
Michael Thomas |
b5a8ec1 |
+scriptdir = @BLT_LIBRARY@
|
|
Michael Thomas |
b5a8ec1 |
destdir = $(scriptdir)/demos
|
|
Michael Thomas |
b5a8ec1 |
srcdir = @srcdir@
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/configure.orig 2008-01-06 22:48:41.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/configure 2008-01-06 22:49:57.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -3756,7 +3756,9 @@
|
|
Michael Thomas |
b5a8ec1 |
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
# Add BLT to the run path
|
|
Michael Thomas |
b5a8ec1 |
-libdir=${exec_prefix}/lib
|
|
Michael Thomas |
b5a8ec1 |
+if test "x${libdir}" == "x" ; then
|
|
Michael Thomas |
b5a8ec1 |
+ libdir=${exec_prefix}/lib
|
|
Michael Thomas |
b5a8ec1 |
+fi
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
if test "x${libdir}" != "x" -a \
|
|
Michael Thomas |
b5a8ec1 |
"${libdir}" != "/usr/lib" -a \
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/Makefile.in.orig 2008-01-06 13:27:01.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/Makefile.in 2008-01-06 22:03:26.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -13,7 +13,7 @@
|
|
Michael Thomas |
b5a8ec1 |
includedir = @includedir@
|
|
Michael Thomas |
b5a8ec1 |
libdir = @libdir@
|
|
Michael Thomas |
b5a8ec1 |
version = @BLT_VERSION@
|
|
Michael Thomas |
b5a8ec1 |
-scriptdir = $(prefix)/lib/blt$(version)
|
|
Michael Thomas |
b5a8ec1 |
+scriptdir = @BLT_LIBRARY@
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
instdirs = $(prefix) \
|
|
Michael Thomas |
b5a8ec1 |
$(exec_prefix) \
|
|
Michael Thomas |
b5a8ec1 |
@@ -28,7 +28,7 @@
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
INSTALL = @INSTALL@
|
|
Michael Thomas |
b5a8ec1 |
INSTALL_DATA = @INSTALL_DATA@
|
|
Michael Thomas |
b5a8ec1 |
-INSTALL_ROOT =
|
|
Michael Thomas |
b5a8ec1 |
+INSTALL_ROOT = @INSTALL_ROOT@
|
|
Michael Thomas |
b5a8ec1 |
SHELL = /bin/sh
|
|
Michael Thomas |
b5a8ec1 |
RM = rm -f
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
@@ -47,17 +47,17 @@
|
|
Michael Thomas |
b5a8ec1 |
(cd library; $(MAKE) install)
|
|
Michael Thomas |
b5a8ec1 |
(cd man; $(MAKE) install)
|
|
Michael Thomas |
b5a8ec1 |
(cd demos; $(MAKE) install)
|
|
Michael Thomas |
b5a8ec1 |
- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
+ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
+ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
mkdirs:
|
|
Michael Thomas |
b5a8ec1 |
@for i in $(instdirs) ; do \
|
|
Michael Thomas |
b5a8ec1 |
if test -d $(INSTALL_ROOT)$$i ; then \
|
|
Michael Thomas |
b5a8ec1 |
: ; \
|
|
Michael Thomas |
b5a8ec1 |
else \
|
|
Michael Thomas |
b5a8ec1 |
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
- mkdir $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
+ mkdir -p $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
fi ; \
|
|
Michael Thomas |
b5a8ec1 |
done
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/src/Makefile.in.orig 2008-01-06 22:27:58.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/src/Makefile.in 2008-01-06 22:28:06.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -22,7 +22,7 @@
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
bindir = $(exec_prefix)/bin
|
|
Michael Thomas |
b5a8ec1 |
exec_prefix = @exec_prefix@
|
|
Michael Thomas |
b5a8ec1 |
-incdir = $(prefix)/include
|
|
Michael Thomas |
b5a8ec1 |
+incdir = @includedir@
|
|
Michael Thomas |
b5a8ec1 |
libdir = @libdir@
|
|
Michael Thomas |
b5a8ec1 |
scriptdir = $(exec_prefix)/lib
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
--- blt2.4z/man/Makefile.in.orig 2008-01-06 20:09:02.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
+++ blt2.4z/man/Makefile.in 2008-01-06 22:57:34.000000000 -0800
|
|
Michael Thomas |
b5a8ec1 |
@@ -10,9 +10,9 @@
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
instdirs = $(mandir) $(mandir)/mann $(mandir)/man3
|
|
Michael Thomas |
b5a8ec1 |
|
|
Michael Thomas |
b5a8ec1 |
-MAN_N = BLT.n barchart.n beep.n bgexec.n bitmap.n \
|
|
Michael Thomas |
b5a8ec1 |
+MAN_N = BLT.n barchart.n beep.n bgexec.n bltbitmap.n \
|
|
Michael Thomas |
b5a8ec1 |
bltdebug.n busy.n container.n cutbuffer.n \
|
|
Michael Thomas |
b5a8ec1 |
- dragdrop.n eps.n graph.n hierbox.n \
|
|
Michael Thomas |
b5a8ec1 |
+ dragdrop.n eps.n bltgraph.n hierbox.n \
|
|
Michael Thomas |
b5a8ec1 |
hiertable.n htext.n spline.n stripchart.n \
|
|
Michael Thomas |
b5a8ec1 |
table.n tabset.n tile.n tree.n treeview.n vector.n \
|
|
Michael Thomas |
b5a8ec1 |
watch.n winop.n
|
|
Michael Thomas |
b5a8ec1 |
@@ -51,8 +51,8 @@
|
|
Michael Thomas |
b5a8ec1 |
if test -d $(INSTALL_ROOT)$$i ; then \
|
|
Michael Thomas |
b5a8ec1 |
: ; \
|
|
Michael Thomas |
b5a8ec1 |
else \
|
|
Michael Thomas |
b5a8ec1 |
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
- mkdir $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
|
|
Michael Thomas |
b5a8ec1 |
+ mkdir -p $(INSTALL_ROOT)$$i ; \
|
|
Michael Thomas |
b5a8ec1 |
fi ; \
|
|
Michael Thomas |
b5a8ec1 |
done
|
|
Michael Thomas |
b5a8ec1 |
|