[Pkg-wmaker-commits] [wmitime] 48/127: debian/*.mk: update
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 01:34:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmitime.
commit 391b716980ce39c1f5e8e3c626825d294b2156c6
Author: Jari Aalto <jari.aalto at cante.net>
Date: Wed Feb 15 07:42:20 2012 -0500
debian/*.mk: update
Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
debian/debian-vars.mk | 156 ++++++++++++++++++++++----------------------------
debian/pod2man.mk | 63 +++++++++++---------
2 files changed, 105 insertions(+), 114 deletions(-)
diff --git a/debian/debian-vars.mk b/debian/debian-vars.mk
index 6c9b71a..3cd97d6 100644
--- a/debian/debian-vars.mk
+++ b/debian/debian-vars.mk
@@ -1,104 +1,86 @@
-# debian-vars.mk -- Common variables
+#!/usr/bin/make -f
#
-# Copyright (C) 2005-2009 Jari Aalto
+# debian-vars.mk -- Common variables
#
-# Released under License GNU GPL v2, or (your choice) any later version.
-# See <http://www.gnu.org/copyleft/gpl.html>.
+# Copyright
#
+# 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 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
+#
+# 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
+
+ifneq (,)
+ This makefile requires GNU Make.
+endif
PACKAGE ?= foo
-PKGDIR = $(CURDIR)/debian/$(PACKAGE)
-SHAREDIR = $(PKGDIR)/usr/share/$(PACKAGE)
-SITELISPDIR = $(PKGDIR)/usr/share/site-lisp
-PKGLISPDIR = $(PKGDIR)/usr/share/site-lisp/$(PACKAGE)
-LIBDIR = $(PKGDIR)/usr/lib/$(PACKAGE)
-PIXDIR = $(PKGDIR)/usr/share/pixmaps
-DESKTOPDIR = $(PKGDIR)/usr/share/applications
-LOCALEDIR = $(PKGDIR)/usr/share/locale
-INFODIR = $(PKGDIR)/usr/share/info
+PIXPACKAGE ?= $(PACKAGE)
+ICONPACKAGE ?= $(PACKAGE)
+TOPDIR := $(shell pwd)
+PKGDIR = $(shell pwd)/debian/$(PACKAGE)
+
+SHAREROOTDIR = $(PKGDIR)/usr/share
+SHAREDIR = $(SHAREROOTDIR)/$(PACKAGE)
+DOCROOTDIR = $(SHAREROOTDIR)/doc
+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
+LIBDIR = $(LIBROOTDIR)/$(PACKAGE)
+LIBPERLDIR = $(LIBROOTDIR)/perl
+
BINDIR = $(PKGDIR)/usr/bin
+ETCDIR = $(PKGDIR)/etc
+PKGETCDIR = $(PKGDIR)/etc/$(PACKAGE)
SBINDIR = $(PKGDIR)/usr/sbin
-MANDIR = $(PKGDIR)/usr/share/man
-MAN1DIR = $(MANDIR)/man1
-MAN5DIR = $(MANDIR)/man5
-MAN8DIR = $(MANDIR)/man8
+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
-
-#######################################################################
-# [Do this to take use of 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
-
-#######################################################################
-# Dealing with packages that have old config.* files: (1) Save (2)
-# Use latest from Debian (3) restore. This way the *diff.gz stays claan.
-#
-# [Do this]
-# config.status: configure
-# ./configure
-# $(config-save)
-# $(config-patch)
-# $(MAKE) $(MAKE_FLAGS)
-#
-# binary-arch: build install
-# ...
-# $(config-restore)
-# dh_builddeb
-
-define config-restore
- # Restore original files
- [ ! -f config.sub.original ] || mv -v config.sub.original config.sub
- [ ! -f config.guess.original ] || mv -v config.guess.original config.guess
-endef
-
-define config-save
- # Save original files
- [ -f config.sub.original ] || cp -v config.sub config.sub.original
- [ -f config.guess.original ] || cp -v config.guess config.guess.original
-endef
-
-ifneq ($(wildcard /usr/share/misc/config.sub),)
-define config-patch-sub
- # Use latest versions
- cp -vf /usr/share/misc/config.sub config.sub
-endef
-endif
-
-ifneq ($(wildcard /usr/share/misc/config.guess),)
-define config-patch-guess
- # Use latest versions
- cp -vf /usr/share/misc/config.guess config.guess
-endef
-endif
-
-define config-patch
- $(config-patch-sub)
- $(config-patch-guess)
-endef
-
-# End of of Makefile part
+# End of Makefile part
diff --git a/debian/pod2man.mk b/debian/pod2man.mk
index a7ae9b7..450fa9a 100644
--- a/debian/pod2man.mk
+++ b/debian/pod2man.mk
@@ -2,55 +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
#
-# install: build $(MANPAGE)
+# man:
+# make -f pod2man.mk PACKAGE=$(PACKAGE) makeman
+#
+# build: man
ifneq (,)
-This makefile requires GNU Make.
+ This makefile requires GNU Make.
endif
-# These variables *must* be set when calling
-PACKAGE = package
-PODCENTER = $$(date "+%Y-%m-%d")
-MANSECT = 1
+# This variable *must* be set when called
+PACKAGE ?= package
+
+# Optional variables to set
+MANSECT ?= 1
+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)
-# FIXME: Remove 2009
-# >= 5.10.0-16 has --utf8 option
-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/wmitime.git
More information about the Pkg-wmaker-commits
mailing list