1 files changed, 10 insertions, 8 deletions

diff --git a/Rules.make b/Rules.make
index b9eab7e..a3646f8 100644
--- a/Rules.make
+++ b/Rules.make
@@ -117,18 +117,20 @@ $(TOPDIR)/scripts/subst : FORCE
 
 $(TOPDIR)/scripts/filesubst : FORCE
         @( \
+                echo 's,\$$OPIEDIR/root/,/,g'; \
+                echo 's,$(OPIEDIR)/root/,/,g'; \
                 echo 's,\$$OPIEDIR,$(prefix),g'; \
                 echo 's,$(OPIEDIR),$(prefix),g'; \
                 echo 's,\$$QTDIR,$(prefix),g'; \
                 echo 's,$(QTDIR),$(prefix),g'; \
-                echo 's,^root/,/,g'; \
-                echo 's,^etc/,$(prefix)/etc/,g'; \
-                echo 's,^lib/,$(prefix)/lib/,g'; \
-                echo 's,^bin/,$(prefix)/bin/,g'; \
-                echo 's,^pics/,$(prefix)/pics/,g'; \
-                echo 's,^sounds/,$(prefix)/sounds/,g'; \
-                echo 's,^plugins/,$(prefix)/plugins/,g'; \
-                echo 's,^apps/,$(prefix)/apps/,g'; \
+                echo 's,^\(\./\)*root/,/,g'; \
+                echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
+                echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
+                echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
+                echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
+                echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
+                echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
+                echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
         ) > $@ || ( rm -f $@; exit 1 )
 
 ## general rules ##