diff options
| author | Keith Packard <keithp@keithp.com> | 2004-12-05 07:44:08 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-12-05 07:44:08 +0000 |
| commit | fc2cc873bb1a715844a1e6f885661bf433bdd7cf (patch) | |
| tree | 09f35e8233f466bdb0414bcb9df76a38a4176a92 | |
| parent | 308dc9c3ea0be2e0823e547f2c612760db7539a2 (diff) | |
Update links to new freedesktop.org locationsfc-2_2_97
Add uninstall-local to get rid of fonts.conf and local.conf if they match
the distributed versions. Fixes 'make distcheck'
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | Makefile.am | 24 |
3 files changed, 34 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2004-12-04 Keith Packard <keithp@keithp.com> + * INSTALL: + Update links to new freedesktop.org locations + * Makefile.am: + Add uninstall-local to get rid of fonts.conf and local.conf if they + match the distributed versions. Fixes 'make distcheck' + +2004-12-04 Keith Packard <keithp@keithp.com> + * README: * configure.in: * fontconfig/fontconfig.h: @@ -25,9 +25,9 @@ important steps: 7. Split out the ChangeLog into ChangeLog-2.2.xx with the changes since the previous release 8. Copy ChangeLog-2.2.xx and fontconfig-2.2.xx.tar.gz to - freedesktop.org:~fontconfig/public_html/release + freedesktop.org:/srv/fontconfig.freedesktop.org/www/release 9. Update the Fontconfig Devel wiki page - http://freedesktop.org/Software/FontconfigDevel + http://fontconfig.org/wiki/Devel 10. Compute md5sums for release files: md5sum fontconfig-2.2.xx.tar.gz ChangeLog-2.2.xx 11. Post a note to fontconfig@fontconfig.org. Include the md5sums. diff --git a/Makefile.am b/Makefile.am index c1e48a1b..7079027e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,3 +62,27 @@ install-data-local: $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \ fi; fi; fi if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi + +uninstall-local: + if [ -f $(srcdir)/fonts.conf ]; then \ + if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \ + echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \ + rm -f $(DESTDIR)$(configdir)/fonts.conf; \ + fi; \ + else if [ -f fonts.conf ]; then \ + if cmp -s fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \ + echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \ + rm -f $(DESTDIR)$(configdir)/fonts.conf; \ + fi; \ + fi; fi + if [ -f $(srcdir)/local.conf ]; then \ + if cmp -s $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; then \ + echo " uninstall standard $(DESTDIR)$(configdir)/local.conf"; \ + rm -f $(DESTDIR)$(configdir)/local.conf; \ + fi; \ + else if [ -f local.conf ]; then \ + if cmp -s local.conf $(DESTDIR)$(configdir)/local.conf; then \ + echo " uninstall standard $(DESTDIR)$(configdir)/local.conf"; \ + rm -f $(DESTDIR)$(configdir)/local.conf; \ + fi; \ + fi; fi |