Use version info from ./Version, separate mpkg and dmg creation into 2 targets

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1141 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/GNUmakefile b/GNUmakefile
index 0b7b8afd38196a28fb0f1eedf87365cbc5f73442..16bbe891f076a5feda33b0acdbfa0ac6614f7a01 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -35,6 +35,8 @@ endif
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.postamble
 
+include ./Version
+
 endif
 
 distclean ::
@@ -47,5 +49,7 @@ macosx-pkg ::
        for i in $(SUBPROJECTS); do \
          (cd $$i; $(MAKE) macosx-pkg); \
        done
-       ./maintenance/make-osxmpkg.sh SOPE-4.5
-       ./maintenance/make-osxdmg.sh SOPE-4.5 osxpkgbuild "SOPE 4.5"
+       ./maintenance/make-osxmpkg.sh SOPE-$(MAJOR_VERSION).$(MINOR_VERSION)
+       
+macosx-dmg :: macosx-pkg
+       ./maintenance/make-osxdmg.sh SOPE-$(MAJOR_VERSION).$(MINOR_VERSION) osxpkgbuild "SOPE $(MAJOR_VERSION).$(MINOR_VERSION)"