aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

More installation fixes

Browse Source 
- Use the mkinstalldirs in $(top_srcdir)/config
 - Fix buggy scripting of srcdir which broke the local gettext install
 - Add the local uninstall stuff so we have it around
This commit is contained in:
Jonas Fonseca 2005-09-23 20:30:56 +02:00 committed by Jonas Fonseca
parent 49a6d7cf8d
commit 23497405cb
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.config.in
View File

@ -65,7 +65,7 @@ LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LOCALEDIR = @LOCALEDIR@
LUA_CFLAGS = @LUA_CFLAGS@
LUA_LIBS = @LUA_LIBS@
MKINSTALLDIRS = @MKINSTALLDIRS@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
MSGFMT = @MSGFMT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
PACKAGE = @PACKAGE@

34
src/intl/gettext/Makefile
View File

@ -4,6 +4,9 @@ include $(path_to_top)/Makefile.config
localedir = $(datadir)/locale
builddir = $(top_builddir)/src/intl/gettext
# FIXME: Makefile.config gets this wrong
srcdir = $(top_srcdir)/src/intl/gettext
OBJS = \
bindtextdom.o \
dcgettext.o \
@ -28,8 +31,10 @@ all-l: libintl.a
libintl.a: $(OBJS)
# $(builddir)/charset.alias: $(srcdir)/config.charset
$(builddir)/charset.alias: $(srcdir)/config.charset
$(SHELL) $(srcdir)/config.charset '@host@' > $@.new
mv $@.new $@
# FIXME: Building plural.c from plural.y on the fly doesn't work
@ -71,6 +76,33 @@ install-l: $(builddir)/charset.alias all
else \
: ; \
fi
mv $@.new $@
uninstall-l:
@if test '@USE_INCLUDED_LIBINTL@' = yes; then \
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
temp=$(DESTDIR)$(libdir)/t-charset.alias; \
dest=$(DESTDIR)$(libdir)/charset.alias; \
sed -f ref-del.sed $$dest > $$temp; \
if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
rm -f $$dest; \
else \
$(INSTALL_DATA) $$temp $$dest; \
fi; \
rm -f $$temp; \
fi; \
if test -f $(DESTDIR)$(localedir)/locale.alias; then \
temp=$(DESTDIR)$(localedir)/t-locale.alias; \
dest=$(DESTDIR)$(localedir)/locale.alias; \
sed -f ref-del.sed $$dest > $$temp; \
if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
rm -f $$dest; \
else \
$(INSTALL_DATA) $$temp $$dest; \
fi; \
rm -f $$temp; \
fi; \
else \
: ; \
fi
include $(path_to_top)/Makefile.lib