diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-16 09:31:15 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-16 09:36:16 -0700 |
| commit | 58b6b2d99595619934ebd4f2c82617d654133edd (patch) | |
| tree | d735630ef4357d1c6894c88d1227ec328e5020c1 | |
| parent | 8bdf2df6908ee93b5dd993ca49fc17ea19c99189 (diff) | |
glib: Don't install charset.alias file
On non-glibc systems a charset.alias file is installed, but we don't
need this for our purposes.
| -rw-r--r-- | glib-patches/no-installed-files.patch | 36 | ||||
| -rw-r--r-- | glib/glib/libcharset/Makefile.am | 25 |
2 files changed, 36 insertions, 25 deletions
diff --git a/glib-patches/no-installed-files.patch b/glib-patches/no-installed-files.patch index 004c6c2..8f416cc 100644 --- a/glib-patches/no-installed-files.patch +++ b/glib-patches/no-installed-files.patch @@ -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 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-$@ |