summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-06 20:10:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-07 00:23:52 (GMT)
commit7a59013290bb26b80c997e5698757a735f1a92e0 (patch)
tree9658c6be6996dba62cc6c10d2c85b3bcc97621d9
parentd3af621b147bb90a31fdc3b55e07853f45deb658 (diff)
downloadgit-7a59013290bb26b80c997e5698757a735f1a92e0.zip
git-7a59013290bb26b80c997e5698757a735f1a92e0.tar.gz
git-7a59013290bb26b80c997e5698757a735f1a92e0.tar.bz2
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>
-rw-r--r--Makefile18
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules2
-rw-r--r--git-core.spec.in2
4 files changed, 18 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 072d426..ecc2277 100644
--- 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-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)
- 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
diff --git a/debian/changelog b/debian/changelog
index 1e62b78..5e86a86 100644
--- 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 67830b0..1409b8b 100755
--- 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:
diff --git a/git-core.spec.in b/git-core.spec.in
index 5d1ffa3..7d4f9d5 100644
--- 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
-make all %{!?_without_docs: doc}
+make prefix=%{_prefix} all %{!?_without_docs: doc}
%install
rm -rf $RPM_BUILD_ROOT