# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../xmh/xmh-1.0.1-no-bitmap-data.patch # Copyright (C) 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- Do not install bitmap data file (black6, box6) to void shared files with xbitmaps. --- xmh-1.0.1/Makefile.in.orig 2010-07-30 15:53:03.440375496 +0200 +++ xmh-1.0.1/Makefile.in 2010-07-30 15:57:36.984172088 +0200 @@ -218,8 +218,6 @@ # bitmap files bitmapdir = $(includedir)/X11/bitmaps -dist_bitmap_DATA = black6 box6 - # EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Xmh.sample $(appman_PRE) @@ -290,9 +288,9 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(xmh_SOURCES) -DATA = $(appdefault_DATA) $(appman_DATA) $(dist_bitmap_DATA) +DATA = $(appdefault_DATA) $(appman_DATA) -DIST_COMMON = README $(dist_bitmap_DATA) $(srcdir)/Makefile.in \ +DIST_COMMON = README $(srcdir)/Makefile.in \ $(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ Makefile.am NEWS aclocal.m4 compile config.guess config.h.in \ config.sub configure configure.ac depcomp install-sh missing \ @@ -867,24 +865,6 @@ echo " rm -f $(DESTDIR)$(appmandir)/$$f"; \ rm -f $(DESTDIR)$(appmandir)/$$f; \ done -dist_bitmapDATA_INSTALL = $(INSTALL_DATA) -install-dist_bitmapDATA: $(dist_bitmap_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bitmapdir) - @list='$(dist_bitmap_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f"; \ - $(dist_bitmapDATA_INSTALL) $$d$$p $(DESTDIR)$(bitmapdir)/$$f; \ - done - -uninstall-dist_bitmapDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_bitmap_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(bitmapdir)/$$f"; \ - rm -f $(DESTDIR)$(bitmapdir)/$$f; \ - done ETAGS = etags ETAGSFLAGS = @@ -1106,8 +1086,7 @@ info-am: -install-data-am: install-appdefaultDATA install-appmanDATA \ - install-dist_bitmapDATA +install-data-am: install-appdefaultDATA install-appmanDATA install-exec-am: install-binPROGRAMS @@ -1137,7 +1116,7 @@ ps-am: uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \ - uninstall-binPROGRAMS uninstall-dist_bitmapDATA \ + uninstall-binPROGRAMS \ uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ @@ -1146,14 +1125,14 @@ distclean-hdr distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am info info-am install install-am \ install-appdefaultDATA install-appmanDATA install-binPROGRAMS \ - install-data install-data-am install-dist_bitmapDATA \ + install-data install-data-am \ install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ ps ps-am tags uninstall uninstall-am uninstall-appdefaultDATA \ uninstall-appmanDATA uninstall-binPROGRAMS \ - uninstall-dist_bitmapDATA uninstall-info-am + uninstall-info-am .ad: