diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf index a5c25b81e..7a8ef9f8d 100644 --- a/package/base/bdb/bdb.conf +++ b/package/base/bdb/bdb.conf @@ -38,7 +38,11 @@ is_bdb_default() { # we need the install-sh here, since our gnu-install does not # handle the transform-name ... -is_bdb_default || var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'" +if ! is_bdb_default; then + var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'" + var_append makeinstopt ' ' "transform='s/db/${xpkg:1}/'" + # var_append INSTALL_WRAPPER_FILTER "|" 'sed "s,bin/db,bin/${xpkg:1},"' +fi # bdb doesn't like some of our make options makeopt="docdir=$docdir all" diff --git a/package/base/bdb/transform-name.patch_bdb42 b/package/base/bdb/transform-name.patch_bdb42 new file mode 100644 index 000000000..d57aefa92 --- /dev/null +++ b/package/base/bdb/transform-name.patch_bdb42 @@ -0,0 +1,15 @@ +--- ./dist/Makefile.in.orig 2004-09-07 05:07:00.193054384 +0200 ++++ ./dist/Makefile.in 2004-09-07 05:08:29.964407064 +0200 +@@ -812,11 +812,7 @@ + ($(mkdir) -p $(DESTDIR)$(bindir) && \ + $(chmod) $(dmode) $(DESTDIR)$(bindir)) + @for i in $(UTIL_PROGS); do \ +- $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ +- test -f $$i.exe && i=$$i.exe || true; \ +- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \ +- test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \ +- $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \ ++ cp $$i $(DESTDIR)$(bindir)/`basename $$i | sed $(transform)`; \ + done + + uninstall_utilities: