[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[fontutils-commits] fontutils GNUmakefile.in
From: |
Brandon Invergo |
Subject: |
[fontutils-commits] fontutils GNUmakefile.in |
Date: |
Wed, 10 Apr 2013 22:46:10 +0000 |
CVSROOT: /sources/fontutils
Module name: fontutils
Changes by: Brandon Invergo <brandon> 13/04/10 22:46:10
Modified files:
. : GNUmakefile.in
Log message:
Improve Makefile configuration and support DESTDIR
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/fontutils/GNUmakefile.in?cvsroot=fontutils&r1=1.5&r2=1.6
Patches:
Index: GNUmakefile.in
===================================================================
RCS file: /sources/fontutils/fontutils/GNUmakefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- GNUmakefile.in 15 Sep 2011 14:06:42 -0000 1.5
+++ GNUmakefile.in 10 Apr 2013 22:46:10 -0000 1.6
@@ -17,18 +17,20 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Version number of this release.
-version = .6g
+version = @PACKAGE_VERSION@
+
+DESTDIR =
# Installation prefixes. Since GNU programs and the TeX system may be
# installed in different places, we have different prefixes.
-prefix = /usr/local
-exec_prefix = $(prefix)
-texmf_prefix = /usr/local
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+texmf_prefix = $(prefix)
# Installation directories.
-bindir = $(exec_prefix)/bin
-infodir = $(prefix)/info
-datadir = $(prefix)/lib
+bindir = @bindir@
+infodir = @infodir@
+datadir = @datadir@
fu_datadir = $(datadir)/fontutil
emacs_datadir = $(datadir)/emacs
# Emacs 18 and Emacs 19 both have different directories for this.
@@ -57,7 +59,7 @@
default_pk_path = $(default_tfm_path)
default_gf_path = $(default_tfm_path)
-SHELL = /bin/sh
+SHELL = @SHELL@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -72,13 +74,13 @@
xlibdir = -L $(xlibdirp)
CC = @CC@
-CFLAGS = -g
+CFLAGS = @CFLAGS@
# Need DEFS to get -DHAVE_CONFIG_H. It's included in CPPFLAGS via
# data/defs.make.
DEFS = @DEFS@
-LDFLAGS = $(xlibdir) $(CFLAGS) $(XLDFLAGS)
+LDFLAGS = @LDFLAGS@ $(xlibdir) $(CFLAGS) $(XLDFLAGS)
LIBS = @LIBS@ -lm $(extralibs)
wlibs = @wlibs@
@@ -147,25 +149,34 @@
$< >> $@
-installargs = bindir=$(bindir) \
- fu_datadir=$(fu_datadir) \
- emacslispdir=$(emacslispdir) \
- mfinputdir=$(mfinputdir) \
- texinputdir=$(texinputdir) \
- app_defaults=$(app_defaults) \
+installargs = bindir=$(DESTDIR)$(bindir) \
+ fu_datadir=$(DESTDIR)$(fu_datadir) \
+ emacslispdir=$(DESTDIR)$(emacslispdir) \
+ mfinputdir=$(DESTDIR)$(mfinputdir) \
+ texinputdir=$(DESTDIR)$(texinputdir) \
+ app_defaults=$(DESTDIR)$(app_defaults) \
+ kpathsea_parent=/usr/include/kpathsea \
+ kpathsea=/usr/lib/libkpathsea.a \
+ CFLAGS="$(CFLAGS)" \
INSTALL="$(INSTALL)" \
INSTALL_DATA="$(INSTALL_DATA)" \
INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-install:
- PATH=.:$PATH mkdirchain $(bindir) $(infodir) \
- $(fu_datadir) $(emacslispdir) $(app_defaults)
+installdirs:
+ mkdir -p $(DESTDIR)$(bindir)
+ mkdir -p $(DESTDIR)$(infodir)
+ mkdir -p $(DESTDIR)$(fu_datadir)
+ mkdir -p $(DESTDIR)$(emacslispdir)
+ mkdir -p $(DESTDIR)$(app_defaults)
+ mkdir -p $(DESTDIR)$(texdatadir)
+ mkdir -p $(DESTDIR)$(texinputdir)
+
+install: installdirs
for dir in $(programs) doc; do \
(cd $${dir}; $(MAKE) $(installargs) install);
\
done
cd data; for f in *.enc *.map common.cmi; do \
- $(INSTALL_DATA) $$f $(fu_datadir); done
-
+ $(INSTALL_DATA) $$f $(DESTDIR)$(fu_datadir); done
configure: configure.in
cd $(srcdir); autoconf
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [fontutils-commits] fontutils GNUmakefile.in,
Brandon Invergo <=