make deb: fixed

git-svn-id: trunk@29258 -
This commit is contained in:
mattias 2011-01-30 17:14:14 +00:00
parent c884c0bab6
commit fc51ee2b76
2 changed files with 4 additions and 10 deletions

View File

@ -3587,19 +3587,16 @@ DEB_BUILDPKG_OPT=-sa
else else
DEB_BUILDPKG_OPT= DEB_BUILDPKG_OPT=
endif endif
ifeq ($(wildcard ${DEBSRC_ORIG}.tar.gz),)
ifeq (${DEBBUILD},0) ifeq (${DEBBUILD},0)
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq (${DEBBUILD},1) ifeq (${DEBBUILD},1)
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq (${DEBBUILD},)
DEBUSESVN=1
endif
ifdef SNAPSHOT ifdef SNAPSHOT
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq ($(wildcard ${DEBSRC_ORIG}.tar.gz),)
ifndef DEBUSESVN ifndef DEBUSESVN
$(error Need "${DEBSRC_ORIG}.tar.gz" to build for DEBBUILD = "${DEBBUILD}" > 1) $(error Need "${DEBSRC_ORIG}.tar.gz" to build for DEBBUILD = "${DEBBUILD}" > 1)
endif endif
@ -3634,7 +3631,7 @@ ifdef DEBUSESVN
lcl \ lcl \
packager \ packager \
test \ test \
tools \ tools
echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc
else else
tar -C ${BUILDDIR} -zxf ${DEBSRC_ORIG}.tar.gz ${DEBSRC} tar -C ${BUILDDIR} -zxf ${DEBSRC_ORIG}.tar.gz ${DEBSRC}

View File

@ -183,19 +183,16 @@ DEB_BUILDPKG_OPT=-sa
else else
DEB_BUILDPKG_OPT= DEB_BUILDPKG_OPT=
endif endif
ifeq ($(wildcard ${DEBSRC_ORIG}.tar.gz),)
ifeq (${DEBBUILD},0) ifeq (${DEBBUILD},0)
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq (${DEBBUILD},1) ifeq (${DEBBUILD},1)
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq (${DEBBUILD},)
DEBUSESVN=1
endif
ifdef SNAPSHOT ifdef SNAPSHOT
DEBUSESVN=1 DEBUSESVN=1
endif endif
ifeq ($(wildcard ${DEBSRC_ORIG}.tar.gz),)
ifndef DEBUSESVN ifndef DEBUSESVN
$(error Need "${DEBSRC_ORIG}.tar.gz" to build for DEBBUILD = "${DEBBUILD}" > 1) $(error Need "${DEBSRC_ORIG}.tar.gz" to build for DEBBUILD = "${DEBBUILD}" > 1)
endif endif
@ -232,7 +229,7 @@ ifdef DEBUSESVN
lcl \ lcl \
packager \ packager \
test \ test \
tools \ tools
# add ide/revision.inc # add ide/revision.inc
echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc
else else