Author: pebender
Date: Mon Jan 5 07:03:31 2009
New Revision: 4170
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/devel/fakeroot/Makefile
trunk/gar-minimyth/script/utils/bash/Makefile
Log:
- Changed the location of bash from /usr/bin to /bin.
- Fixed a bug that could cause the fakeroot script to use the wrong shell.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Jan 5
07:03:31 2009
@@ -62,6 +62,7 @@
- Added persistent device links for the Wiimote.
- Removed obsolete udev rules and script that where used used create
quasi-persistent input device names.
+ - Changed the location of bash from /usr/bin to /bin.
Fixed bugs
- Fixed a bug that prevented Wiimote devices from working.
@@ -78,6 +79,7 @@
minimyth.conf.
- Fixed a bug where error messages were logged with the
deprecated 'error'
level rather than the 'err' level.
+ - Fixed a bug that could cause the fakeroot script to use the wrong
shell.
Modified build system
- Enabled building of wmgui in utils/cwiid package.
Modified: trunk/gar-minimyth/script/devel/fakeroot/Makefile
==============================================================================
--- trunk/gar-minimyth/script/devel/fakeroot/Makefile (original)
+++ trunk/gar-minimyth/script/devel/fakeroot/Makefile Mon Jan 5 07:03:31
2009
@@ -11,7 +11,7 @@
DEPENDS = lang/c
-CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure shell
BUILD_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = $(WORKSRC)/Makefile
@@ -28,6 +28,13 @@
pre-configure:
@$(call FIX_LIBTOOL,$(WORKSRC)/configure)
+ @$(MAKECOOKIE)
+
+configure-shell:
+ @$(if $(filter build,$(DESTIMG)), \
+ sed -i -e 's...@shell@%$(DESTDIR)$(ebindir)/sh%g'
$(WORKSRC)/scripts/fakeroot.in , \
+ sed -i -e 's...@shell@%$(ebindir)/sh%g'
$(WORKSRC)/scripts/fakeroot.in \
+ )
@$(MAKECOOKIE)
post-install:
Modified: trunk/gar-minimyth/script/utils/bash/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/bash/Makefile (original)
+++ trunk/gar-minimyth/script/utils/bash/Makefile Mon Jan 5 07:03:31 2009
@@ -26,6 +26,10 @@
include ../../gar.mk
+libdir := $(elibdir)
+bindir := $(ebindir)
+sbindir := $(esbindir)
+
patch-%: normal-patch-%
@$(MAKECOOKIE)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
