Add .gitignore. Adapt Makefile.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..72618dc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+oss-pkg-NotePadPP.spec

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..fc166cc7d169157b4da4f61f01246510f6906b99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/salt-packages/
+REPO            = /srv/www/repo/TESTING/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
@@ -8,8 +8,7 @@ YEAR            = $(shell date +%Y )
 
 
 package:
-       if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi
-       sed -i s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec
+       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
        sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec
        sed -i s/PACKAGE/$(PACKAGE)/g  oss-pkg-$(PACKAGE).spec
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec