GIT 0.99.4 (release candidate)

This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 072d4267b6d9f0c2b46d75a15f935120b5b3bbec..ecc2277540194cc06762892680d96568a4db9af1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
 
 # DEFINES += -DUSE_STDEV
 

-GIT_VERSION=0.99.3
+GIT_VERSION=0.99.4

 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)


@@ -156,7 +156,9 @@ all: $(PROG)
 all:
        $(MAKE) -C templates
 
 all:
        $(MAKE) -C templates
 

-.PRECIOUS: %.o
+.SECONDARY: %.o
+.c.o:
+       $(CC) $(CFLAGS) -o $*.o -c $*.c

 git-%: %.o $(LIB_FILE)
        $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 git-%: %.o $(LIB_FILE)
        $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 


@@ -231,17 +233,17 @@ dist: git-core.spec git-tar-tree
 rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
 rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 

-
-backup: clean
-       cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
+deb: dist
+       rm -rf git-core-$(GIT_VERSION)
+       tar zxf git-core-$(GIT_VERSION).tar.gz
+       cd git-core-$(GIT_VERSION) && fakeroot debian/rules binary

 
 ### Cleaning rules
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
 
 ### Cleaning rules
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)

-       rm -f git-core-*.tar.gz git-core.spec
+       rm -f git-core-*.tar.gz git-core.spec git-core-$(GIT_VERSION)-*.deb
+       rm -rf git-core-$(GIT_VERSION)

        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean

diff --git a/debian/changelog b/debian/changelog
index 1e62b783b3cc1688420d757ed33925b755a1b957..5e86a86dc53083e04fa79b2401cea26b92d25320 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.4-1) unstable; urgency=low
+
+  * Pass prefix down to the submake when building.
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 6 Aug 2005 13:00:00 -0700
+

 git-core (0.99-2) unstable; urgency=low
 
   * Conflict with the GNU Interactive Tools package, which also installs
 git-core (0.99-2) unstable; urgency=low
 
   * Conflict with the GNU Interactive Tools package, which also installs

diff --git a/debian/rules b/debian/rules
index 67830b03b9c3b867e8363aea858112a2262a13d5..1409b8b280f9d9ea7c8af34b462c4e2358ab3b2e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR)
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir

-       $(MAKE) all doc
+       $(MAKE) prefix=$(PREFIX) all doc

        touch debian/build-stamp
 
 debian-clean:
        touch debian/build-stamp
 
 debian-clean:

diff --git a/git-core.spec.in b/git-core.spec.in
index 5d1ffa37ed947f4413b3858506bcf441e850eb5d..7d4f9d5ab7cb090a42bb826beb639d52fcd4c6bf 100644 (file)
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -24,7 +24,7 @@ similar to other SCM tools (like CVS, BitKeeper or Monotone).
 
 %build
 
 
 %build
 

-make all %{!?_without_docs: doc}
+make prefix=%{_prefix} all %{!?_without_docs: doc}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT