[Pkg-wmaker-commits] [wmfrog] 62/145: debian/*.mk: update
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sun Aug 23 05:46:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmfrog.
commit 562ddc74a1fe0b22fbac7cecbd08901b3180db26
Author: Jari Aalto <jari.aalto at cante.net>
Date: Wed Feb 15 06:17:08 2012 -0500
debian/*.mk: update
Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
debian/debian-vars.mk | 112 ++++++++++++++++----------------------------------
debian/pod2man.mk | 52 +++++++++++++----------
2 files changed, 66 insertions(+), 98 deletions(-)
diff --git a/debian/debian-vars.mk b/debian/debian-vars.mk
index 70e76b3..3cd97d6 100644
--- a/debian/debian-vars.mk
+++ b/debian/debian-vars.mk
@@ -1,26 +1,31 @@
-# debian-vars.mk -- Common variables
+#!/usr/bin/make -f
+#
+# debian-vars.mk -- Common variables
#
# Copyright
#
-# Copyright (C) 2005-2009 Jari Aalto <jari.aalto at cante.net>
+# Copyright (C) 2005-2010 Jari Aalto <jari.aalto at cante.net>
#
# License
#
-# This program is free software; you can redistribute it and or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details at
-# <http://www.gnu.org/copyleft/gpl.html>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Description
#
-# This is GNU makefile part, that defines common variables and
-# macros to be used from debian/rules. To install, add this:
+# This is GNU makefile part that defines common variables and
+# macros to be used from debian/rules. To install, add following
+# to the beginning of debian/rules:
#
# PACKAGE = foo
# include debian/debian-vars.mk
@@ -30,22 +35,30 @@ ifneq (,)
endif
PACKAGE ?= foo
-PKGDIR = $(CURDIR)/debian/$(PACKAGE)
+PIXPACKAGE ?= $(PACKAGE)
+ICONPACKAGE ?= $(PACKAGE)
+TOPDIR := $(shell pwd)
+PKGDIR = $(shell pwd)/debian/$(PACKAGE)
SHAREROOTDIR = $(PKGDIR)/usr/share
SHAREDIR = $(SHAREROOTDIR)/$(PACKAGE)
DOCROOTDIR = $(SHAREROOTDIR)/doc
-PKGDOCDIR = $(SHAREROOTDIR)/doc/$(PACKAGE)
-SITELISPDIR = $(SHAREROOTDIR)/site-lisp
-PKGLISPDIR = $(SHAREROOTDIR)/site-lisp/$(PACKAGE)
+PKGDOCDIR = $(DOCROOTDIR)/$(PACKAGE)
+SITELISPDIR = $(SHAREROOTDIR)/emacs/site-lisp
+PKGLISPDIR = $(SITELISPDIR)/$(PACKAGE)
DESKTOPDIR = $(SHAREROOTDIR)/applications
+XSESSIONDIR = $(SHAREROOTDIR)/xsessions
LOCALEDIR = $(SHAREROOTDIR)/locale
INFODIR = $(SHAREROOTDIR)/info
PIXDIR = $(SHAREROOTDIR)/pixmaps
+PKGPIXDIR = $(PIXDIR)/$(PIXPACKAGE)
+ICONDIR = $(SHAREROOTDIR)/icons
+PKGICONDIR = $(ICONDIR)/$(ICONPACKAGE)
MANROOTDIR = $(SHAREROOTDIR)/man
MAN1DIR = $(MANROOTDIR)/man1
MAN5DIR = $(MANROOTDIR)/man5
+MAN7DIR = $(MANROOTDIR)/man7
MAN8DIR = $(MANROOTDIR)/man8
LIBROOTDIR = $(PKGDIR)/usr/lib
@@ -53,74 +66,21 @@ LIBDIR = $(LIBROOTDIR)/$(PACKAGE)
LIBPERLDIR = $(LIBROOTDIR)/perl
BINDIR = $(PKGDIR)/usr/bin
+ETCDIR = $(PKGDIR)/etc
+PKGETCDIR = $(PKGDIR)/etc/$(PACKAGE)
SBINDIR = $(PKGDIR)/usr/sbin
+GAMEBINDIR = $(PKGDIR)/usr/games
INSTALL ?= /usr/bin/install
+INSTALL_DIR = $(INSTALL) -m 755 -d
INSTALL_DATA = $(INSTALL) -p -m 644
+
+# The difference is that "BIN" may contain binary strip option
INSTALL_SCRIPT = $(INSTALL) -p -m 755
INSTALL_BIN = $(INSTALL) -p -m 755
-INSTALL_DIR = $(INSTALL) -m 755 -d
-
-#######################################################################
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-#
-# [Add this]
-# config.status: configure
-# ...
-# ./configure --host=$(DEB_HOST_GNU_TYPE) \
-# --build=$(DEB_BUILD_GNU_TYPE) \
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-#######################################################################
-# [Add this to use multiple CPU cores]
-# build-stamp:
-# $(MAKE) $(MAKE_FLAGS)
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_BIN += -s
endif
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-MAKE_FLAGS =
-CPU_COUNT := $(shell fgrep -c processor /proc/cpuinfo 2> /dev/null | \
- egrep "^[2-9]$$|^[0-9][0-9]$$")
-
-ifneq ($(CPU_COUNT),)
- MAKE_FLAGS += -j$(CPU_COUNT)
-endif
-
-#######################################################################
-# If the override is for a source package, you have to place it at
-# debian/source.lintian-overrides. For binary, Write file
-# debian/<package>.lintian-overrides
-#
-# <package> binary: <lintian-error> <file>
-#
-# [Add this to debian/rules]
-# install:
-# ...
-# $(MAKE) install
-# $(lintian-overrides)
-
-OVERRIDEDIR = usr/share/lintian/overrides
-PKGDIR_LINTIAN = $(PKGDIR)/$(OVERRIDEDIR)
-
-define lintian-overrides
- # Install Lintian override file
- $(INSTALL_DIR) $(PKGDIR_LINTIAN)
- $(INSTALL_DATA) debian/$(PACKAGE).lintian-overrides \
- $(PKGDIR_LINTIAN)/$(PACKAGE)
-
-endef
-
# End of Makefile part
diff --git a/debian/pod2man.mk b/debian/pod2man.mk
index 31ac969..450fa9a 100644
--- a/debian/pod2man.mk
+++ b/debian/pod2man.mk
@@ -2,56 +2,64 @@
#
# Copyright information
#
-# Copyright (C) 2008-2009 Jari Aalto
+# Copyright (C) 2008-2010 Jari Aalto
#
# License
#
-# This program is free software; you can redistribute it and/or
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details at
-# Visit <http://www.gnu.org/copyleft/gpl.html>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Description
#
-# Convert *.pod files to manual pages. Write this to 'install'
-# target:
+# Convert *.pod files to manual pages. Add this to Makefile:
+#
+# PACKAGE = package
+#
+# man:
+# make -f pod2man.mk PACKAGE=$(PACKAGE) makeman
#
-# install: build $(MANPAGE)
+# build: man
ifneq (,)
This makefile requires GNU Make.
endif
-# This variable *must* be set when calling
+# This variable *must* be set when called
PACKAGE ?= package
# Optional variables to set
MANSECT ?= 1
-PODCENTER ?= $$(date "+%Y-%m-%d")
+PODCENTER ?= User Commands
+PODDATE ?= $$(date "+%Y-%m-%d")
# Directories
-MANSRC =
-MANDEST = $(MANSRC)
+MANSRC ?=
+MANDEST ?= $(MANSRC)
-MANPOD = $(MANSRC)$(PACKAGE).$(MANSECT).pod
-MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT)
+MANPOD ?= $(MANSRC)$(PACKAGE).$(MANSECT).pod
+MANPAGE ?= $(MANDEST)$(PACKAGE).$(MANSECT)
-POD2MAN = pod2man
-POD2MAN_FLAGS = --utf8
+POD2MAN ?= pod2man
+POD2MAN_FLAGS ?= --utf8
makeman: $(MANPAGE)
$(MANPAGE): $(MANPOD)
+ # make target - create manual page from a *.pod page
podchecker $(MANPOD)
LC_ALL= LANG=C $(POD2MAN) $(POD2MAN_FLAGS) \
--center="$(PODCENTER)" \
+ --date="$(PODDATE)" \
--name="$(PACKAGE)" \
--section="$(MANSECT)" \
$(MANPOD) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfrog.git
More information about the Pkg-wmaker-commits
mailing list