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>
This commit is contained in:
Junio C Hamano 2005-08-06 13:10:43 -07:00
parent d3af621b14
commit 7a59013290
4 changed files with 18 additions and 10 deletions

View File

@ -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

6
debian/changelog vendored
View File

@ -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

2
debian/rules vendored
View File

@ -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:

View File

@ -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