Merge with master.

This merges commit
6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
jit-merge command.

diff --git a/Makefile b/Makefile
index 072d4267b6d9f0c2b46d75a15f935120b5b3bbec..c01327c1c623950f8b9f83d913ef6d7aa136ced0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.3
+GIT_VERSION=0.99.4
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@ -156,7 +156,9 @@ all: $(PROG)
 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)
 
@@ -231,17 +233,17 @@ dist: git-core.spec git-tar-tree
 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_TARNAME)
+       tar zxf $(GIT_TARNAME).tar.gz
+       cd $(GIT_TARNAME) && fakeroot debian/rules binary
 
 ### 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_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+       rm -rf $(GIT_TARNAME)
        $(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

diff --git a/debian/rules b/debian/rules
index 67830b03b9c3b867e8363aea858112a2262a13d5..2c575ffa1929f392df751f991c561c623f5a06f2 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
-       $(MAKE) all doc
+       $(MAKE) prefix=$(PREFIX) all doc
        touch debian/build-stamp
 
 debian-clean:
@@ -56,7 +56,7 @@ install: build
        dh_clean -k 
        dh_installdirs 
 
-       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-doc
+       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc
 
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'

diff --git a/git-core.spec.in b/git-core.spec.in
index 5d1ffa37ed947f4413b3858506bcf441e850eb5d..9921f46e9e88b450ee29f382337f8e2b53ccb695 100644 (file)
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -24,11 +24,11 @@ similar to other SCM tools (like CVS, BitKeeper or Monotone).
 
 %build
 
-make all %{!?_without_docs: doc}
+make prefix=%{_prefix} all %{!?_without_docs: doc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} install %{!?_without_docs: install-doc}
+make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} install install-tools %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,6 +36,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_bindir}/*
+%{_datadir}/git-core/templates/*
 %doc README COPYING Documentation/*.txt
 %{!?_without_docs: %doc Documentation/*.html }
 %{!?_without_docs: %{_mandir}/man1/*.1.gz}