summaryrefslogtreecommitdiff
path: root/security/tcl-tls/patches/patch-ab
blob: dc0cdd5bac4d6626e5812f11c7036312b892222c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
$NetBSD: patch-ab,v 1.3 2010/06/25 06:28:09 obache Exp $

--- Makefile.in.orig	2004-02-04 04:02:17.000000000 +0000
+++ Makefile.in
@@ -122,6 +122,7 @@ POST_UNINSTALL = :
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 CC = @CC@
+TCL_CC = @TCL_CC@
 CFLAGS_DEBUG = @CFLAGS_DEBUG@
 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
@@ -136,7 +137,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
 OBJEXT = @OBJEXT@
 RANLIB = @RANLIB@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) ${TCLLIB}
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
 SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
 STLIB_LD = @STLIB_LD@
@@ -208,20 +209,20 @@ install-binaries: binaries install-lib-b
 	sed -e "s#\@RELPATH\@#$(RELPATH)#" \
 	-e "s#\@tls_LIB_FILE\@#$(tls_LIB_FILE)#" \
 	< $(srcdir)/pkgIndex.tcl.in > pkgIndex.tcl
-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
 
 #========================================================================
 # This rule installs platform-independent files, such as header files.
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@echo "Installing header files in $(includedir)"
 	@for i in $(GENERIC_HDRS) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(includedir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 	done;
-	$(INSTALL_DATA) $(srcdir)/tls.tcl $(pkglibdir)
+	$(INSTALL_DATA) $(srcdir)/tls.tcl $(DESTDIR)$(pkglibdir)
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)