add / to directory

diff --git a/Makefile b/Makefile
index f0a430e96f7e1b8564909e9be0309f1a60150693..8548b30986adfbe11e9b6f056324bd4d87e91a4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
        zpm-findpkg zpm-shell zpm-soneed
 
-SCRIPTS=zpm zpm-install zpm-merge zpm-list
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -27,11 +27,11 @@ d:
        printf '%s\n' $(LZMAOBJ)
        printf '%s\n' $(PATH)
 
-package: zpm-0.1-1.zpm
+package: zpm-$(ZPMVER)-1.zpm
 
 ZPM:= ./zpm -P scripts:bin:.
 
-zpm-0.1-1.zpm: programs
+zpm-$(ZPMVER)-1.zpm: programs
        rm -f $@
        $(ZPM) newpackage -f $@ -v 0.1 zpm
        $(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v 0.1 zpm $(PROGRAMS)

diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index de9771115dc93029fd78cf978de2281a3fad7673..281fccadd1f137d5b4c6ee1d445ab2eb2413e7cd 100755 (executable)
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -58,6 +58,8 @@ for path in $*; do
                dir=$pkgroot/$dir
                dir=${dir%/.}
 #              if [ "$dir" = "//" ]; then dir=/ ; fi
+       else
+               dir="/$dir"
        fi
 
        # TODO generate some unique hash