Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 90886 | Differences between
and this patch

Collapse All | Expand All

(-)libiconv-1.9.2/src/Makefile.in (-5 / +7 lines)
Lines 52-58 Link Here
52
# i.e. during "make install". The intermediate 'iconv' executable is built
52
# i.e. during "make install". The intermediate 'iconv' executable is built
53
# without internationalization and not linked with libintl.
53
# without internationalization and not linked with libintl.
54
54
55
all : iconv_no_i18n iconv.@OBJEXT@
55
all : iconv_no_i18n iconv.@OBJEXT@ iconv
56
	test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
56
	test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
57
57
58
# This is the temporary iconv executable, without internationalization.
58
# This is the temporary iconv executable, without internationalization.
Lines 77-82 Link Here
77
@SET_RELOCATABLE@
77
@SET_RELOCATABLE@
78
iconv_LDFLAGS = `if test -n '$(RELOCATABLE_LDFLAGS)'; then $(RELOCATABLE_LDFLAGS) $(bindir); fi`
78
iconv_LDFLAGS = `if test -n '$(RELOCATABLE_LDFLAGS)'; then $(RELOCATABLE_LDFLAGS) $(bindir); fi`
79
79
80
iconv: iconv.@OBJEXT@
81
	case "@host_os@" in \
82
	 hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L../lib -liconv @LIBINTL@ -o iconv;; \
83
	 *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
84
	esac
85
80
# During "make install", we can build the final iconv executable.
86
# During "make install", we can build the final iconv executable.
81
# On HP-UX, in order to ensure that the new libiconv.sl will override the old
87
# On HP-UX, in order to ensure that the new libiconv.sl will override the old
82
# one that is hardcoded in libintl.sl, we need to mention libiconv.sl before
88
# one that is hardcoded in libintl.sl, we need to mention libiconv.sl before
Lines 90-99 Link Here
90
	if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
96
	if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
91
	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
97
	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
92
	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
98
	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
93
	case "@host_os@" in \
94
	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
95
	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
96
	esac
97
	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
99
	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
98
100
99
installdirs : force
101
installdirs : force

Return to bug 90886