=== modified file 'applets/trash/Makefile.am'
--- applets/trash/Makefile.am	2007-07-30 23:21:37 +0000
+++ applets/trash/Makefile.am	2007-08-18 16:18:47 +0000
@@ -50,7 +50,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 $(desktop_DATA).in: $(desktop_DATA).in.in
-	sed -e "s|\@LIBDIR\@|$(libdir)|g" $< > $@
+	sed -e 's|@LIBDIR@|$(libdir)|g' $< > $@
 
 gladedir = $(libdir)/awn/applets/trash
 glade_DATA = trashapplet.glade

=== modified file 'awn-manager/Makefile.am'
--- awn-manager/Makefile.am	2007-08-18 11:42:31 +0000
+++ awn-manager/Makefile.am	2007-08-18 16:10:51 +0000
@@ -15,13 +15,16 @@
 
 
 $(desktop_DATA).in: $(desktop_DATA).in.in
-	sed -e "s|\@PKGDATADIR\@|$(pkgdatadir)|g" $< > $@
+	sed -e 's|@PKGDATADIR@|$(pkgdatadir)|g' $< > $@
 
 awnDefs.py: awnDefs.in.py
-	sed -e "s|\@DATADIR\@|$(datadir)|g" awnDefs.in.py > awnDefs.py
+	set -x
+	sed -e 's|@DATADIR@|$(datadir)|g' \
+	    -e 's|@PREFIX@|$(prefix)|g'   \
+	    awnDefs.in.py > awnDefs.py
 
 install-exec-local:
-	sed -e "s|\@DATADIR\@|$(datadir)|g" awnManager.in.py > awnManager.py
+	sed -e 's|@DATADIR@|$(datadir)|g' awnManager.in.py > awnManager.py
 	$(INSTALL) -m 755 awnManager.py $(DESTDIR)$(bindir)/awn-manager
 
 EXTRA_DIST = $(glade_DATA) awnManager.in.py awnDefs.in.py

=== modified file 'awn-manager/awnApplet.py'
--- awn-manager/awnApplet.py	2007-08-18 11:42:31 +0000
+++ awn-manager/awnApplet.py	2007-08-18 15:39:41 +0000
@@ -20,6 +20,7 @@
 #
 #  Notes: Avant Window Navigator applet preferences window
 
+import awnDefs
 import sys, os, time
 try:
     import pygtk
@@ -311,8 +312,7 @@
         model = self.appmodel
 
         hdir = os.path.join (os.environ["HOME"], ".config/awn/applets")
-        dirs = ["/usr/lib/awn/applets",
-                "/usr/local/lib/awn/applets",
+        dirs = [os.path.join (defs.PREFIX, "lib/awn/applets"),
                 "/usr/lib64/awn/applets",
                 "/usr/local/lib64/awn/applets",
                 hdir]