mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-25 22:59:08 +02:00
make deb: fixed
git-svn-id: trunk@29258 -
This commit is contained in:
parent
c884c0bab6
commit
fc51ee2b76
7
Makefile
7
Makefile
@ -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}
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user