2007-06-07 13:16:30 +02:00
|
|
|
--- Makefile.in
|
|
|
|
+++ Makefile.in
|
|
|
|
@@ -93,12 +93,13 @@
|
|
|
|
datadir = @datadir@
|
|
|
|
mandir = @mandir@
|
|
|
|
includedir = @includedir@
|
|
|
|
+tclscriptdir = $(libdir)
|
|
|
|
|
|
|
|
DESTDIR =
|
|
|
|
|
|
|
|
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
|
|
|
|
pkgdatadir = $(datadir)/$(PKG_DIR)
|
|
|
|
-pkglibdir = $(libdir)/$(PKG_DIR)
|
|
|
|
+pkglibdir = $(tclscriptdir)/$(PKG_DIR)
|
|
|
|
pkgincludedir = $(includedir)/$(PKG_DIR)
|
|
|
|
|
|
|
|
top_builddir = .
|
|
|
|
@@ -296,7 +297,7 @@
|
|
|
|
(\
|
|
|
|
echo 'if {[catch {package require Tcl 8.4}]} return';\
|
|
|
|
echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
|
|
|
|
- [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\
|
|
|
|
+ [list load $(PKG_LIB_FILE) $(PACKAGE_NAME)]'\
|
|
|
|
) > pkgIndex.tcl
|
|
|
|
|
|
|
|
#========================================================================
|
|
|
|
@@ -327,23 +328,24 @@
|
|
|
|
#========================================================================
|
|
|
|
|
|
|
|
install-lib-binaries:
|
|
|
|
- @mkdir -p $(DESTDIR)$(pkglibdir)
|
|
|
|
+ @mkdir -p $(DESTDIR)$(libdir)
|
|
|
|
@list='$(lib_BINARIES)'; for p in $$list; do \
|
|
|
|
if test -f $$p; then \
|
|
|
|
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
|
|
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
|
|
|
- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
|
|
- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
|
|
|
|
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
|
|
|
|
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
|
|
|
|
+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
|
|
|
|
+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
|
|
|
|
ext=`echo $$p|sed -e "s/.*\.//"`; \
|
|
|
|
if test "x$$ext" = "xdll"; then \
|
|
|
|
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
|
|
|
|
if test -f $$lib; then \
|
|
|
|
- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
|
|
|
|
- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
|
|
|
|
+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
|
|
|
|
+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
|
2007-01-16 00:39:10 +01:00
|
|
|
fi; \
|
2007-06-07 13:16:30 +02:00
|
|
|
fi; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
+ @mkdir -p $(DESTDIR)$(pkglibdir)
|
|
|
|
@echo "Installing library files to $(DESTDIR)$(pkglibdir)/$$destp";
|
|
|
|
@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
|
|
|
|
if test -f $(srcdir)/$$p; then \
|