summaryrefslogtreecommitdiff
path: root/converters/libiconv/patches/patch-ae
blob: 567333a933378677ebb5fba97539552afd3a2f6e (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
$NetBSD: patch-ae,v 1.7 2010/11/10 21:00:50 adam Exp $

--- libcharset/lib/Makefile.in.orig	2009-06-21 11:17:33.000000000 +0000
+++ libcharset/lib/Makefile.in
@@ -9,7 +9,7 @@ srcdir = @srcdir@
 prefix = @prefix@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
-libdir = @libdir@
+libdir ?= @libdir@
 
 # Programs used by "make":
 CC = @CC@
@@ -79,13 +79,13 @@ ref-del.sed : $(srcdir)/ref-del.sin
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
 install-lib : all force
-	$(mkinstalldirs) $(libdir)
-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
-	                                || orig=charset.alias; \
-	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-	$(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-	rm -f $(libdir)/t-charset.alias
+
+install-charset-alias : all force
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+#	$(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(libdir)/libcharset.la
+	orig=charset.alias; \
+	sed -f ref-add.sed $$orig > t-charset.alias; \
+	$(INSTALL_DATA) t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -108,7 +108,9 @@ install : all force
 	  need_charset_alias=false ; \
 	fi ; \
 	$(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+	$(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+
+install-charset-alias-unused:
 	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
 	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \