IDE: implemented overriding debian directory in Makefile from Mazen

git-svn-id: trunk@14612 -
This commit is contained in:
mattias 2008-03-22 10:47:07 +00:00
parent aecf8b4b64
commit 1e130f9f61
2 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/02] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/02/29]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@ -3407,10 +3407,9 @@ zipsourceinstall: fpc_zipsourceinstall
zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
zipdistinstall: fpc_zipdistinstall zipdistinstall: fpc_zipdistinstall
distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS)) distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
info: fpc_info info: fpc_info
makefiles: fpc_makefiles makefiles: fpc_makefiles
.PHONY: debug smart release units shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info makefiles .PHONY: debug smart release units shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean info makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
@ -3443,9 +3442,9 @@ cleanlaz: cleanide
purge: cleanlaz purge: cleanlaz
$(MAKE) -C examples clean $(MAKE) -C examples clean
$(MAKE) -C tools clean $(MAKE) -C tools clean
$(MAKE) -C doceditor clean
$(MAKE) -C tools clean $(MAKE) -C tools clean
clean: cleanlaz clean: cleanlaz
cleanall: purge
installbase: installbase:
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
else else
@ -3466,6 +3465,9 @@ else
cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz
endif endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
ifndef DEBDIR
DEBDIR=debian
endif
ifndef BUILDDIR ifndef BUILDDIR
BUILDDIR=$(BASEDIR)/build BUILDDIR=$(BASEDIR)/build
endif endif
@ -3481,9 +3483,9 @@ endif
ifndef SVNREVISION ifndef SVNREVISION
SVNREVISION=$(svnversion) $(BASEDIR) SVNREVISION=$(svnversion) $(BASEDIR)
endif endif
ifneq ($(wildcard debian/changelog),) ifneq ($(wildcard ${DEBDIR}/changelog),)
.PHONY: debcopy deb .PHONY: debcopy deb
DEBPACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]') DEBPACKAGEVERSION:=$(shell head -n 1 ${DEBDIR}/changelog | awk '{ print $$2 }' | tr -d '[()]')
DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }') DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION) DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION)
debcheck: debcheck:
@ -3494,6 +3496,7 @@ endif
debcopy: distclean debcopy: distclean
rm -rf ${BUILDDIR} rm -rf ${BUILDDIR}
install -d $(DEBSRCDIR) install -d $(DEBSRCDIR)
$(LINKTREE) ${DEBDIR} $(DEBSRCDIR)/debian
$(LINKTREE) Makefile.fpc $(DEBSRCDIR) $(LINKTREE) Makefile.fpc $(DEBSRCDIR)
$(LINKTREE) COPYING $(DEBSRCDIR) $(LINKTREE) COPYING $(DEBSRCDIR)
$(LINKTREE) COPYING.GPL $(DEBSRCDIR) $(LINKTREE) COPYING.GPL $(DEBSRCDIR)
@ -3501,7 +3504,6 @@ debcopy: distclean
$(LINKTREE) README.txt $(DEBSRCDIR) $(LINKTREE) README.txt $(DEBSRCDIR)
$(LINKTREE) components $(DEBSRCDIR) $(LINKTREE) components $(DEBSRCDIR)
$(LINKTREE) converter $(DEBSRCDIR) $(LINKTREE) converter $(DEBSRCDIR)
$(LINKTREE) debian $(DEBSRCDIR)
$(LINKTREE) debugger $(DEBSRCDIR) $(LINKTREE) debugger $(DEBSRCDIR)
$(LINKTREE) designer $(DEBSRCDIR) $(LINKTREE) designer $(DEBSRCDIR)
$(LINKTREE) doceditor $(DEBSRCDIR) $(LINKTREE) doceditor $(DEBSRCDIR)

View File

@ -133,6 +133,10 @@ endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
ifndef DEBDIR
DEBDIR=debian
endif
# Build dir # Build dir
ifndef BUILDDIR ifndef BUILDDIR
BUILDDIR=$(BASEDIR)/build BUILDDIR=$(BASEDIR)/build
@ -153,11 +157,11 @@ ifndef SVNREVISION
SVNREVISION=$(svnversion) $(BASEDIR) SVNREVISION=$(svnversion) $(BASEDIR)
endif endif
ifneq ($(wildcard debian/changelog),) ifneq ($(wildcard ${DEBDIR}/changelog),)
.PHONY: debcopy deb .PHONY: debcopy deb
DEBPACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]') DEBPACKAGEVERSION:=$(shell head -n 1 ${DEBDIR}/changelog | awk '{ print $$2 }' | tr -d '[()]')
DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }') DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION) DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION)
@ -170,6 +174,7 @@ endif
debcopy: distclean debcopy: distclean
rm -rf ${BUILDDIR} rm -rf ${BUILDDIR}
install -d $(DEBSRCDIR) install -d $(DEBSRCDIR)
$(LINKTREE) ${DEBDIR} $(DEBSRCDIR)/debian
$(LINKTREE) Makefile.fpc $(DEBSRCDIR) $(LINKTREE) Makefile.fpc $(DEBSRCDIR)
$(LINKTREE) COPYING $(DEBSRCDIR) $(LINKTREE) COPYING $(DEBSRCDIR)
$(LINKTREE) COPYING.GPL $(DEBSRCDIR) $(LINKTREE) COPYING.GPL $(DEBSRCDIR)
@ -177,7 +182,6 @@ debcopy: distclean
$(LINKTREE) README.txt $(DEBSRCDIR) $(LINKTREE) README.txt $(DEBSRCDIR)
$(LINKTREE) components $(DEBSRCDIR) $(LINKTREE) components $(DEBSRCDIR)
$(LINKTREE) converter $(DEBSRCDIR) $(LINKTREE) converter $(DEBSRCDIR)
$(LINKTREE) debian $(DEBSRCDIR)
$(LINKTREE) debugger $(DEBSRCDIR) $(LINKTREE) debugger $(DEBSRCDIR)
$(LINKTREE) designer $(DEBSRCDIR) $(LINKTREE) designer $(DEBSRCDIR)
$(LINKTREE) doceditor $(DEBSRCDIR) $(LINKTREE) doceditor $(DEBSRCDIR)
@ -220,5 +224,3 @@ endif # changelog found
endif endif
# end.