diff --git a/BaseBuild/makeall b/BaseBuild/makeall
index 3e366e9..11aab87 100755
--- a/BaseBuild/makeall
+++ b/BaseBuild/makeall
@@ -128,8 +128,9 @@ done
 msgfmt ViitorInstall/locale/Viitor_Install.pod.de -o /usr/share/locale/de/LC_MESSAGES/Viitor_Install.mo
 mv ViitorInstall install
 cd install
-./GenPkgList `dirname $DISTTARGET`/BINARY >`dirname $DISTTARGET`/.pkglist
-sed -i "s/BINARY/$BINDIR/g" 
+./GenPkgList $DISTTARGET >$DISTTARGET/.pkglist
+$VMAKEDIR/Scripts/GenBaseCfg >BaseDevel.cfg
+$VMAKEDIR/Scripts/GenBuildList >All.cfg`
 chmod 755 *
 cd genCD
 sed -i "s/BINARY/$BINDIR/g" .genCD_Functions
@@ -143,8 +144,6 @@ fi
 svn co $SVNURL/Viitor_cdboot
 mv Viitor_cdboot/$BOOTDIR boot
 rm -r Viitor_cdboot
-$VMAKEDIR/Scripts/GenBaseCfg >`basename `dirname $DISTTARGET`/install/BaseDevel.cfg`
-$VMAKEDIR/Scripts/GenBuildList >`basename `dirname $DISTTARGET`/install/All.cfg`
 umount /tmp
 umount /dev/pts
 umount /dev/shm