Permalink
Browse files

Fix missing $(DESTDIR) on call to mkinstalldirs. Does not fix build,

now has plist issues; not sure what the deal with those is.
  • Loading branch information...
dholland
dholland committed Dec 13, 2011
1 parent ddcb094 commit 76ac9689e1fc34824601b725a42874a9247985a9
Showing with 30 additions and 10 deletions.
  1. +3 −3 wm/fvwm-themes/distinfo
  2. +13 −3 wm/fvwm-themes/patches/patch-Makefile.am
  3. +14 −4 wm/fvwm-themes/patches/patch-Makefile.in
View
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2011/07/09 14:20:53 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/12/13 04:56:10 dholland Exp $
SHA1 (fvwm-themes-0.6.2.tar.bz2) = 63e2ed90bd172494611d3d37a418406c8e61bb27
RMD160 (fvwm-themes-0.6.2.tar.bz2) = 49706c0d2a367d2a2877ea5d1030397314ec211f
Size (fvwm-themes-0.6.2.tar.bz2) = 592419 bytes
SHA1 (fvwm-themes-extra-0.6.2.tar.bz2) = 3112f6ac44453f0fe1ec97553d6b167483f64012
RMD160 (fvwm-themes-extra-0.6.2.tar.bz2) = c78e47d355638760a990477c990e2f705dd347e7
Size (fvwm-themes-extra-0.6.2.tar.bz2) = 378884 bytes
-SHA1 (patch-Makefile.am) = 3ffd7c82bc3102abfcbe31d1050a12612ab39d21
-SHA1 (patch-Makefile.in) = ac08d78e293916ef2289b1a266d279b9028d4fde
+SHA1 (patch-Makefile.am) = 78d472478f75e84fdec3f921051ffb0fd52f75f3
+SHA1 (patch-Makefile.in) = 5b4c4a82d76b3a253c21bf96007f31a4c8133f4c
SHA1 (patch-bin_Makefile.in) = 374482a3e72ebd312bbacd2e39e51e3460511c04
SHA1 (patch-bin_fvwm-themes-config-destdir.in) = 07913ca78721c6d3c53a7caad2e9834e6bd3cd05
@@ -1,9 +1,19 @@
-$NetBSD: patch-Makefile.am,v 1.1 2011/07/09 14:20:53 wiz Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2011/12/13 04:56:10 dholland Exp $
-Use destdir fake version at install target:
+- Use destdir fake version at install target.
+- Fix missing DESTDIR in mkinstalldirs invocation.
---- work/fvwm-themes-0.6.2/Makefile.am.orig 2002-12-06 02:01:37.000000000 +0000
+--- Makefile.am.orig 2002-12-06 02:01:37.000000000 +0000
+++ Makefile.am
+@@ -18,7 +18,7 @@ install-data-local:
+ RUN_UPDATEMENU=@RUN_UPDATEMENU@
+ UPDATE_MENU=@UPDATE_MENU@
+
+- $(mkinstalldirs) $(FT_DATADIR)
++ $(mkinstalldirs) $(DESTDIR)$(FT_DATADIR)
+ for dir in $(FT_DATA_SUBDIRS); do \
+ chmod -R o-w,go+rX $$dir 2>/dev/null || true; \
+ rm -rf "$(DESTDIR)$(FT_DATADIR)/$$dir"; \
@@ -33,10 +33,10 @@ install-data-local:
mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
@@ -1,9 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2011/07/09 14:20:53 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2011/12/13 04:56:10 dholland Exp $
-Use destdir fake version at install target:
+- Use destdir fake version at install target.
+- Fix missing DESTDIR in mkinstalldirs invocation.
---- work/fvwm-themes-0.6.2/Makefile.in.orig 2002-12-06 02:59:28.000000000 +0000
-+++ ./Makefile.in
+--- Makefile.in.orig 2002-12-06 02:59:28.000000000 +0000
++++ Makefile.in
+@@ -357,7 +357,7 @@ install-data-local:
+ RUN_UPDATEMENU=@RUN_UPDATEMENU@
+ UPDATE_MENU=@UPDATE_MENU@
+
+- $(mkinstalldirs) $(FT_DATADIR)
++ $(mkinstalldirs) $(DESTDIR)$(FT_DATADIR)
+ for dir in $(FT_DATA_SUBDIRS); do \
+ chmod -R o-w,go+rX $$dir 2>/dev/null || true; \
+ rm -rf "$(DESTDIR)$(FT_DATADIR)/$$dir"; \
@@ -372,10 +372,10 @@ install-data-local:
mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)

0 comments on commit 76ac968

Please sign in to comment.