fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-15 18:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib: Don't install charset.alias file

Browse source 
On non-glibc systems a charset.alias file is installed, but we don't
need this for our purposes.
This commit is contained in:
Dan Nicholson 2012-08-16 09:31:15 -07:00
parent 8bdf2df690
commit 58b6b2d995
2 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
glib-patches/no-installed-files.patch
View file

@ -161,6 +161,42 @@ index 6fb3a34..1cf80a2 100644
-
-uninstall-gdb:
- -rm -r $(DESTDIR)$(datadir)/gdb
diff --git a/glib/glib/libcharset/Makefile.am b/glib/glib/libcharset/Makefile.am
index f5362df..f45e498 100644
--- a/glib/glib/libcharset/Makefile.am
+++ b/glib/glib/libcharset/Makefile.am
@@ -24,31 +24,6 @@ EXTRA_DIST += \
charset_alias = $(DESTDIR)$(libdir)/charset.alias
charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: all-local
- $(mkinstalldirs) $(DESTDIR)$(libdir)
- if test -f $(charset_alias); then \
- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- else \
- if test @GLIBC21@ = no; then \
- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- fi ; \
- fi
-
-uninstall-local: all-local
- if test -f $(charset_alias); then \
- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
- if grep '^# Packages using this file: $$' $(charset_tmp) \
- > /dev/null; then \
- rm -f $(charset_alias); \
- else \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
- fi; \
- rm -f $(charset_tmp); \
- fi
charset.alias: config.charset
$(AM_V_GEN) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am
index 75a9ca0..10a2f5f 100644
--- a/glib/m4macros/Makefile.am

25
glib/glib/libcharset/Makefile.am
View file

@ -24,31 +24,6 @@ EXTRA_DIST += \
charset_alias = $(DESTDIR)$(libdir)/charset.alias
charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
install-exec-local: all-local
$(mkinstalldirs) $(DESTDIR)$(libdir)
if test -f $(charset_alias); then \
sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
rm -f $(charset_tmp) ; \
else \
if test @GLIBC21@ = no; then \
sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
rm -f $(charset_tmp) ; \
fi ; \
fi
uninstall-local: all-local
if test -f $(charset_alias); then \
sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
if grep '^# Packages using this file: $$' $(charset_tmp) \
> /dev/null; then \
rm -f $(charset_alias); \
else \
$(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
fi; \
rm -f $(charset_tmp); \
fi
charset.alias: config.charset
$(AM_V_GEN) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@