141 lines
4.8 KiB
Plaintext
141 lines
4.8 KiB
Plaintext
$OpenBSD: patch-unix_Makefile_in,v 1.1 2009/01/16 00:02:32 sthen Exp $
|
|
--- unix/Makefile.in.orig Thu Apr 17 11:14:08 2008
|
|
+++ unix/Makefile.in Sun Sep 28 18:00:06 2008
|
|
@@ -482,7 +482,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcol
|
|
|
|
all: binaries libraries doc
|
|
|
|
-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
|
|
+binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
|
|
|
|
libraries:
|
|
|
|
@@ -502,6 +502,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f $@
|
|
@MAKE_STUB_LIB@
|
|
|
|
+${TK_BUILD_EXP_FILE}: ${OBJS}
|
|
+ rm -f $@
|
|
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
|
|
+
|
|
# Build Aqua resource files
|
|
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
|
|
rm -f $@
|
|
@@ -616,18 +620,14 @@ install-strip:
|
|
# possible (e.g. if installing as root).
|
|
|
|
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
|
|
- @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
|
|
+ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) ; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @if test ! -x $(SRC_DIR)/install-sh; then \
|
|
- chmod +x $(SRC_DIR)/install-sh; \
|
|
- fi
|
|
@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
|
|
echo "Creating package index $(PKG_INDEX)"; \
|
|
rm -f $(PKG_INDEX); \
|
|
@@ -640,16 +640,16 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
|
|
fi
|
|
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
@@INSTALL_LIB@
|
|
- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
|
|
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
|
|
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
|
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
|
$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
|
|
+ (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(TK_EXP_FILE)); \
|
|
fi
|
|
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
|
|
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
|
- @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
|
|
- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
|
|
+ @echo "Installing tkConfig.sh to $(SCRIPT_INSTALL_DIR)/"
|
|
+ @$(INSTALL_DATA) tkConfig.sh $(SCRIPT_INSTALL_DIR)/tkConfig.sh
|
|
@if test "$(STUB_LIB_FILE)" != "" ; then \
|
|
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
|
|
@INSTALL_STUB_LIB@ ; \
|
|
@@ -660,29 +660,36 @@ install-libraries: libraries
|
|
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
|
|
XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
|
|
for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
|
|
+ $(INCLUDE_INSTALL_DIR)/generic $(INCLUDE_INSTALL_DIR)/unix \
|
|
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
|
|
$(SCRIPT_INSTALL_DIR)/msgs; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @if test ! -x $(SRC_DIR)/install-sh; then \
|
|
- chmod +x $(SRC_DIR)/install-sh; \
|
|
- fi
|
|
@echo "Installing header files";
|
|
@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
|
|
$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \
|
|
do \
|
|
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
|
+ cd $(INCLUDE_INSTALL_DIR)/generic && ln -sf ../`basename $$i` ./`basename $$i`; \
|
|
done;
|
|
@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
|
|
do \
|
|
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
|
|
done;
|
|
+ @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
|
|
+ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h ; \
|
|
+ do \
|
|
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/generic; \
|
|
+ done;
|
|
+ @for i in $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS); \
|
|
+ do \
|
|
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/unix; \
|
|
+ done;
|
|
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
|
|
@for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
|
|
$(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
|
|
@@ -711,8 +718,7 @@ install-demos:
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
@@ -722,11 +728,12 @@ install-demos:
|
|
if [ -f $$i ] ; then \
|
|
sed -e '3 s|exec wish|exec wish$(VERSION)|' \
|
|
$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
|
|
+ chmod 444 $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
|
|
fi; \
|
|
done;
|
|
@for i in $(DEMOPROGS); \
|
|
do \
|
|
- chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
|
|
+ chmod 555 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
|
|
done;
|
|
@echo "Installing demo images";
|
|
@for i in $(TOP_DIR)/library/demos/images/*; \
|
|
@@ -744,8 +751,7 @@ install-doc:
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|