summaryrefslogtreecommitdiffstats
path: root/converters/libiconv/files/patch-ae
blob: 196d15361b54d72dcd9a7ce6be80340cb0a0bb81 (plain) (blame)
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- libcharset/lib/Makefile.in.orig Mon Apr 14 22:51:06 2003
+++ libcharset/lib/Makefile.in  Sat Jul 10 02:37:15 2004
@@ -10,6 +10,7 @@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+sysconfdir = ${exec_prefix}/libdata
 
 # Programs used by "make":
 CC = @CC@
@@ -42,7 +43,7 @@
 
 # Before making a release, change this according to the libtool documentation,
 # section "Library interface versions".
-LIBCHARSET_VERSION_INFO = 1:0:0
+LIBCHARSET_VERSION_INFO = 1
 
 # Needed by $(LIBTOOL).
 top_builddir = ..
@@ -57,7 +58,7 @@
    $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
 
 localcharset.lo : $(srcdir)/localcharset.c
-   $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
+   $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
 
 relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
    $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
@@ -78,7 +79,7 @@
 # $(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
+   $(LIBTOOL_INSTALL) cp 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; \
@@ -95,15 +96,16 @@
 install : all force
    $(mkinstalldirs) $(DESTDIR)$(libdir)
    $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-   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; \
-     rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+   if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
+     sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+     $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+     rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
    else \
      if test @GLIBC21@ = no; then \
-       sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-       $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-       rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+       sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+       $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+       rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
      fi ; \
    fi