diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-12-17 09:57:00 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-12-17 09:57:00 -0600 |
| commit | 0b3634bcc4a9b69b566b06dc2b68316f77a82864 (patch) | |
| tree | ee9b013c41c33665a3ccd40e1edb9332ca481494 /Makefile.am | |
| parent | efaeadaa86521a366ccc55f6217417f02e944f31 (diff) | |
| download | libpng-0b3634bcc4a9b69b566b06dc2b68316f77a82864.tar.gz | |
[libpng16] Reverted install of pngconfig.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index bad01d6cb..bd82846c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ endif #distribute headers in /usr/include/libpng/* pkgincludedir= $(includedir)/$(PNGLIB_BASENAME) -pkginclude_HEADERS= png.h pngconf.h pngconfig.h +pkginclude_HEADERS= png.h pngconf.h nodist_pkginclude_HEADERS= pnglibconf.h # pkg-config stuff, note that libpng.pc is always required in order @@ -111,9 +111,8 @@ $(PNGLIB_BASENAME).pc: libpng.pc $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ -scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h pngconfig.h -scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt \ - pngconfig.h +scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h +scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt libpng.sym: scripts/sym.out rm -f $@ @@ -202,15 +201,12 @@ dist-hook: # install the .../include headers as links to the new ones install-data-hook: - cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h \ - pngconfig.h + cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \ pngconf.h cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \ pnglibconf.h - cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconfig.h \ - pngconfig.h cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc @@ -228,8 +224,7 @@ install-exec-hook: done uninstall-hook: - cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h \ - pngconfig.h + cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc rm -f $(DESTDIR)$(bindir)/libpng-config rm -f $(DESTDIR)$(libdir)/libpng.a |