1 --- fvwm-themes-base-0.6.1/Makefile.am.orig Fri May 23 20:25:48 2003
2 +++ fvwm-themes-base-0.6.1/Makefile.am Fri May 23 20:37:43 2003
4 RUN_UPDATEMENU=@RUN_UPDATEMENU@
5 UPDATE_MENU=@UPDATE_MENU@
7 - $(mkinstalldirs) $(FT_DATADIR)
8 + $(mkinstalldirs) $(DESTDIR)$(FT_DATADIR)
9 for dir in $(FT_DATA_SUBDIRS); do \
10 chmod -R o-w,go+rX $$dir 2>/dev/null || true; \
11 - rm -rf "$(FT_DATADIR)/$$dir"; \
12 + rm -rf "$(DESTDIR)$(FT_DATADIR)/$$dir"; \
13 (if test -f $$dir.tar.gz; then gzip -dc $$dir.tar.gz || exit 201; \
14 else $(TAR) cpf - $$dir || exit 202; fi) | \
15 - (cd "$(FT_DATADIR)" && $(TAR) xfBp - || exit 203); \
16 - find "$(FT_DATADIR)/$$dir" -name CVS -exec rm -r {} \; 2>/dev/null; \
17 + (cd "$(DESTDIR)$(FT_DATADIR)" && $(TAR) xfBp - || exit 203); \
18 + find "$(DESTDIR)$(FT_DATADIR)/$$dir" -name CVS -exec rm -r {} \; 2>/dev/null; \
21 - $(FVWM_BINDIR)/fvwm-config --version | grep 2.4. >/dev/null \
22 - && rm -rf "$(FT_DATADIR)/themes/redmondxp" || true
23 +# $(FVWM_BINDIR)/fvwm-config --version | grep 2.4. >/dev/null \
24 +# && rm -rf "$(DESTDIR)$(FT_DATADIR)/themes/redmondxp" || true
26 sed -e "s,xGNOME_IMAGES_DIRx,$(GNOME_IMAGES_DIR),g" \
27 - $(SETTINGS_FILE) > $(SETTINGS_FILE).tmp && \
28 - mv -f $(SETTINGS_FILE).tmp $(SETTINGS_FILE)
29 + $(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \
30 + mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
32 - PATH="$(bindir):$(FVWM_BINDIR):$$PATH"; \
33 - $(bindir)/fvwm-themes-config --site --reset
34 +# PATH="$(bindir):$(FVWM_BINDIR):$$PATH"; \
35 +# $(bindir)/fvwm-themes-config --site --reset
37 if test "$(BUILD_MENUS)" = "yes"; then \
38 - $(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
39 + $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
42 if test "$(GNOME_ICONS)" = "yes"; then \
43 - $(bindir)/fvwm-themes-images --ft-install --gnome; \
44 + $(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --gnome; \
47 if test "$(KDE2_ICONS)" = "yes"; then \
48 - $(bindir)/fvwm-themes-images --ft-install --kde2; \
49 + $(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --kde2; \
52 if test "$(RUN_UPDATEMENU)" = "yes"; then \
53 --- fvwm-themes-base-0.6.0/acinclude.m4.orig Wed Aug 15 08:18:28 2001
54 +++ fvwm-themes-base-0.6.0/acinclude.m4 Wed Feb 12 12:06:13 2003
57 dnl mg_ARG_WITH(NAME, HELP-STRING, VAR [, DEFAULT-VALUE])
59 -[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
60 +[AC_DIVERT_PUSH(NOTICE)dnl