79 lines
3.1 KiB
Plaintext
79 lines
3.1 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.2 2010/06/07 14:40:47 sthen Exp $
|
|
--- Makefile.in.orig Tue Sep 10 22:27:21 2002
|
|
+++ Makefile.in Mon Jun 7 09:45:14 2010
|
|
@@ -10,6 +10,7 @@
|
|
# Current [incr Widgets] version; used in various names.
|
|
|
|
ITCL_VERSION = @ITCL_VERSION@
|
|
+ITK_VERSION = @ITK_VERSION@
|
|
IWIDGETS_VERSION = @VERSION@
|
|
|
|
#----------------------------------------------------------------
|
|
@@ -39,7 +40,8 @@ bindir = @bindir@
|
|
INSTALL_ROOT =
|
|
|
|
# Path name to use when installing library scripts:
|
|
-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(IWIDGETS_VERSION)
|
|
+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets
|
|
+DEMOS_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/examples/iwidgets
|
|
|
|
# Directory in which to install the archive libtcl.a:
|
|
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
|
|
@@ -78,11 +80,11 @@ SHELL = /bin/sh
|
|
# modify any of this stuff by hand.
|
|
#----------------------------------------------------------------
|
|
|
|
-INSTALL = $(TCLSH_PROG) `$(CYGPATH) $(ITCL_SRC_DIR)/../config/installFile.tcl` -c
|
|
+INSTALL = install
|
|
INSTALL_PROGRAM = $(INSTALL)
|
|
INSTALL_DATA = $(INSTALL) -m 644
|
|
INSTALL_SCRIPT = $(INSTALL) -m 555
|
|
-MKINSTALLDIRS = $(ITCL_SRC_DIR)/../config/mkinstalldirs
|
|
+MKINSTALLDIRS = mkdir -p
|
|
RANLIB = @RANLIB@
|
|
LN_S = ln -s
|
|
TOP_DIR = $(srcdir)
|
|
@@ -120,8 +122,6 @@ test:
|
|
|
|
install-libraries:
|
|
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
|
|
- @rm -f $(LIB_INSTALL_DIR)/iwidgets
|
|
- $(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
|
|
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
|
|
@echo "Installing source files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
|
|
@for i in $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
|
|
@@ -135,26 +135,26 @@ install-libraries:
|
|
done;
|
|
|
|
install-demos:
|
|
- @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
|
|
- @echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
|
|
+ @$(MKINSTALLDIRS) $(DEMOS_INSTALL_DIR)/images $(DEMOS_INSTALL_DIR)/html
|
|
+ @echo "Installing demos from $(srcdir)/demos into $(DEMOS_INSTALL_DIR}"
|
|
@for i in $(srcdir)/demos/*; \
|
|
do \
|
|
if [ -f $$i ] ; then \
|
|
- $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
|
|
+ $(INSTALL_SCRIPT) $$i $(DEMOS_INSTALL_DIR); \
|
|
fi; \
|
|
done;
|
|
- @echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
|
|
+ @echo "Installing images from $(srcdir)/demos/images into $(DEMOS_INSTALL_DIR)/images"
|
|
for i in $(srcdir)/demos/images/*; \
|
|
do \
|
|
if [ -f $$i ] ; then \
|
|
- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
|
|
+ $(INSTALL_DATA) $$i $(DEMOS_INSTALL_DIR)/images; \
|
|
fi; \
|
|
done;
|
|
- @echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
|
|
+ @echo "Installing html man pages from $(srcdir)/demos/html into $(DEMOS_INSTALL_DIR)/html"
|
|
for i in $(srcdir)/demos/html/*; \
|
|
do \
|
|
if [ -f $$i ] ; then \
|
|
- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
|
|
+ $(INSTALL_DATA) $$i $(DEMOS_INSTALL_DIR)/html; \
|
|
fi; \
|
|
done;
|
|
|