jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable

This commit is contained in:
Julien Cristau 2008-08-02 17:22:26 +02:00
parent 7bcd07ba5e 86e7669f5d
commit 5a2a656033
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
debian/xsfbs/xsfbs.mk vendored
View File

@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but # Find out if this is an official build; an official build has nothing but
# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the # digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build. # version number. Anything else indicates an unofficial build.
OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment. # Set up parameters for the Debian build environment.
@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets. # $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir STAMP_DIR:=stampdir
# $(SOURCE_DIR) houses one or more source trees.
SOURCE_DIR:=build-tree
# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
# is more than one, others are found using this name plus a suffix to indicate
# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
# "setup" target is responsible for creating such trees.
#SOURCE_TREE:=$(SOURCE_DIR)/xc
#FIXME We need to define this in our debian/rules file
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place # $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files. # their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp DEBTREEDIR:=$(CURDIR)/debian/tmp
@ -119,13 +109,16 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it. # Set up the package build directory as quilt expects to find it.
.PHONY: prepare .PHONY: prepare
stampdir_targets+=prepare stampdir_targets+=prepare
prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log prepare: $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
>$@ >$@
.PHONY: log
stampdir_targets+=log
log: $(STAMP_DIR)/log
$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
# Apply all patches to the upstream source. # Apply all patches to the upstream source.
.PHONY: patch .PHONY: patch
stampdir_targets+=patch stampdir_targets+=patch
@ -152,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source. # Revert all patches to the upstream source.
.PHONY: unpatch .PHONY: unpatch
unpatch: $(STAMP_DIR)/prepare unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \ @echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \ if $(QUILT) applied >/dev/null 2>/dev/null; then \