Commits

Ivan Vučica committed bbae010

Debian packages are being installed in System domain. Fixed libobjc2 configuration. Changed GNUmakefile.deb to GNUmakefile_deb so that they cp does not make a mess out of destination for Debian packages.

Comments (0)

Files changed (5)

phases/16-pack-libobjc2.sh

 		rm -rf _CPack_Packages
 	fi
 	sudo rm -rf install_manifest.txt
-	if cpack -G DEB -DCPACK_PACKAGING_INSTALL_PREFIX=/GNUstep -DCPACK_INSTALL_PREFIX= ; then
+	if cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/GNUstep ; then
 		echo "CPack ok"
 		cp *.deb "$GSU_BUILD_ROOT"/
 	else

phases/21-pack-gnustep-make.sh

 
 cd gnustep/core/make
 
-sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile.deb
 
-if make -f GNUmakefile.deb deb ; then
+if make -f GNUmakefile deb ; then
 	echo "Package built"
 	cp *.deb "$GSU_BUILD_ROOT"/
 else

phases/26-pack-gnustep-base.sh

 
 cd gnustep/core/base
 
-sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile.deb
+sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile_deb
 
-if make -f GNUmakefile.deb deb ; then
+if make -f GNUmakefile_deb GNUSTEP_INSTALLATION_DOMAIN=SYSTEM deb ; then
 	echo "Package built"
 	cp *.deb "$GSU_BUILD_ROOT"/
 else

phases/31-pack-gnustep-gui.sh

 
 cd gnustep/core/gui
 
-sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile.deb
+sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile_deb
 
-if make -f GNUmakefile.deb deb ; then
+if make -f GNUmakefile_deb GNUSTEP_INSTALLATION_DOMAIN=SYSTEM deb ; then
 	echo "Package built"
 	cp *.deb "$GSU_BUILD_ROOT"/
 else

phases/36-pack-gnustep-back.sh

 
 cd gnustep/core/back
 
-sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile.deb
+sed 's,\(include $(GNUSTEP_MAKEFILES)/aggregate.make\),\1\ninclude $(GNUSTEP_MAKEFILES)/Master/deb.make,' < GNUmakefile > GNUmakefile_deb
 
-if make -f GNUmakefile.deb deb ; then
+if make -f GNUmakefile_deb GNUSTEP_INSTALLATION_DOMAIN=SYSTEM deb ; then
 	echo "Package built"
 	cp *.deb "$GSU_BUILD_ROOT"/
 else