3a84fed861
configuration database from beeing modified by packages that do not honour the --disable-schemas-install option. There is no need to patch these broken packages any more. Okay'ed by wiz.
35 lines
1.7 KiB
Text
35 lines
1.7 KiB
Text
$NetBSD: patch-ad,v 1.3 2003/02/18 20:52:09 jmmv Exp $
|
|
|
|
--- applets/fish/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100
|
|
+++ applets/fish/Makefile.in
|
|
@@ -174,7 +174,7 @@ EXTRA_DIST = $(FISH_BITMAPS) GNOME
|
|
gladedir = $(datadir)/fish
|
|
glade_DATA = fish.glade
|
|
|
|
-fishbitmapsdir = $(datadir)/pixmaps/fish
|
|
+fishbitmapsdir = $(datadir)/pixmaps/fish2
|
|
fishbitmaps_DATA = $(FISH_BITMAPS)
|
|
|
|
pixmapdir = $(datadir)/pixmaps
|
|
@@ -187,7 +187,7 @@ serverdir = $(libdir)/bonobo/servers
|
|
server_in_files = GNOME_FishApplet_Factory.server.in
|
|
server_DATA = $(server_in_files:.server.in=.server)
|
|
|
|
-schemasdir = $(sysconfdir)/gconf/schemas
|
|
+schemasdir = $(datadir)/gconf/schemas
|
|
schemas_in_files = fish.schemas.in
|
|
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
|
|
|
|
@@ -249,9 +249,10 @@ install-libexecPROGRAMS: $(libexec_PROGR
|
|
@$(NORMAL_INSTALL)
|
|
$(mkinstalldirs) $(DESTDIR)$(libexecdir)
|
|
@list='$(libexec_PROGRAMS)'; for p in $$list; do \
|
|
+ inst=`echo $$p | sed 's/gnome/gnome2/`; \
|
|
if test -f $$p; then \
|
|
- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
|
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$inst|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
|
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$inst|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
else :; fi; \
|
|
done
|
|
|