Improved package creation to exclude archives.

This fixes error with packages containing packages. Also, increased version number.
dkfans · Sep 11, 2015 · 42cf8d5 · 42cf8d5
1 parent dc4cc21
commit 42cf8d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -125,7 +125,8 @@ pkg-before:
 
 pkg/%.tar.gz: pkg-before
 	$(ECHO) 'Creating package: $<'
-	$(TAR) zcf "$@" pkg
+	cd $(@D); \
+	$(TAR) --exclude=*.tar.gz --exclude=*.zip -zcf "$(@F)" .
 	$(ECHO) 'Finished creating: $<'
 	$(ECHO) ' '
 
@@ -134,7 +135,7 @@ tar.gz: pkg/peresec-$(subst .,_,$(VER_STRING))-$(PACKAGE_SUFFIX)-$(PKGOS).tar.gz
 pkg/%.zip: pkg-before
 	$(ECHO) 'Creating package: $<'
 	cd $(@D); \
-	$(ZIP) -9 -r "$(@F)" .
+	$(ZIP) -x*.tar.gz -x*.zip -9 -r "$(@F)" .
 	$(ECHO) 'Finished creating: $<'
 	$(ECHO) ' '
 

diff --git a/version.mk b/version.mk
@@ -1,5 +1,5 @@
 VER_MAJOR=1
-VER_MINOR=0
-VER_RELEASE=9
-VER_BUILD=15
+VER_MINOR=1
+VER_RELEASE=0
+VER_BUILD=16
 PACKAGE_SUFFIX=devel