CVS eclipse-cdt/debian

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse-cdt/debian
In directory haydn:/tmp/cvs-serv26643

Modified Files:
	changelog rules 
Log Message:
Use variable for the name of the releng plugin


--- /cvsroot/pkg-java/eclipse-cdt/debian/changelog	2005/11/28 16:34:02	1.2
+++ /cvsroot/pkg-java/eclipse-cdt/debian/changelog	2005/12/10 11:10:28	1.3
@@ -6,5 +6,6 @@
   [ Stephan Michels ]
   * debian/control: Changed the dependency from eclipse-sdk to eclipse.
     Updated the description.
+  * debian/rules: Use variable for the name of the releng plugin
 
- -- Stephan Michels <stephan at apache.org>  Mon, 28 Nov 2005 17:28:27 +0100
+ -- Stephan Michels <stephan at apache.org>  Sat, 10 Dec 2005 12:08:49 +0100
--- /cvsroot/pkg-java/eclipse-cdt/debian/rules	2005/11/28 16:02:47	1.1
+++ /cvsroot/pkg-java/eclipse-cdt/debian/rules	2005/12/10 11:10:28	1.2
@@ -15,6 +15,8 @@
 ECLIPSE_BASE=/usr/lib/eclipse
 ECLIPSE_PLATFORM=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+RELENG_PLUGIN=org.eclipse.cdt.releng
+
 ifeq ($(DEB_HOST_ARCH),i386)
     ECLIPSE_PLATFORM=x86
 endif
@@ -64,7 +66,7 @@
 	dh_testdir
 	
 	# This patch system was orginally copied off of the one found in cdbs.
-	@cd $(SOURCE_TREE)/org.eclipse.cdt.releng; \
+	@cd $(SOURCE_TREE)/RELENG_PLUGIN; \
 	test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name '*.patch' | wc -l) -eq 0 && exit 0; \
 	for patchname in $(PATCHES); do \
 		patch=$(CURDIR)/debian/patches/$$patchname.patch; \
@@ -87,8 +89,8 @@
 		fi; \
 	done
 
-	sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i  $(CURDIR)/source-tree/org.eclipse.cdt.releng/platform/build.properties 
-	sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i  $(CURDIR)/source-tree/org.eclipse.cdt.releng/sdk/build.properties 
+	sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i  $(CURDIR)/$(SOURCE_TREE)/$(RELENG_PLUGIN)/platform/build.properties 
+	sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i  $(CURDIR)/$(SOURCE_TREE)/$(RELENG_PLUGIN)/sdk/build.properties 
 	
 	touch patch-stamp
 
@@ -105,7 +107,7 @@
 	make ARCH=$(ECLIPSE_PLATFORM) CC='gcc -D_GNU_SOURCE'
 	
 	# Call eclipse headless to process CDT releng build scripts
-	cd source-tree/org.eclipse.cdt.releng && \
+	cd $(SOURCE_TREE)/$(RELENG_PLUGIN) && \
 	$(JAVA_RUN) -cp $(ECLIPSE_BASE)/startup.jar \
 		-Duser.home=$(homedir) \
 		-Dosgi.install.area=$(ECLIPSE_BASE) \
@@ -127,7 +129,7 @@
 	
 	# Install the tar file into our destination directory.
 	install -d debian/tmp/$(ECLIPSE_BASE)
-	tar xzf $(SOURCE_TREE)/org.eclipse.cdt.releng/results/I.*/*.$(ECLIPSE_PLATFORM).tar.gz -C debian/tmp/$(ECLIPSE_BASE)/..
+	tar xzf $(SOURCE_TREE)/$(RELENG_PLUGIN)/results/I.*/*.$(ECLIPSE_PLATFORM).tar.gz -C debian/tmp/$(ECLIPSE_BASE)/..
 	
 	dh_installdirs
 	dh_install