A few autoconf build fixes
This commit is contained in:
parent
48db40f692
commit
c9f55ecb06
12
Makefile.in
12
Makefile.in
|
@ -40,10 +40,10 @@ fonts.conf: fonts.conf.in
|
|||
install:: $(CONFDIR)/fonts.conf $(CONFDIR)/fonts.dtd
|
||||
|
||||
$(CONFDIR)/fonts.conf:: fonts.conf
|
||||
if [ -f $@ ]; then
|
||||
echo "Not overwriting existing $@"
|
||||
else
|
||||
$(INSTALL_DATA) fonts.conf $(CONFDIR)
|
||||
if [ -f $@ ]; then \
|
||||
echo "Not overwriting existing $@"; \
|
||||
else \
|
||||
$(INSTALL_DATA) fonts.conf $(CONFDIR); \
|
||||
fi
|
||||
|
||||
$(CONFDIR)/fonts.dtd:: fonts.dtd
|
||||
|
@ -54,6 +54,8 @@ clean::
|
|||
|
||||
install:: $(BINDIR)/fontconfig-config
|
||||
|
||||
all:: fontconfig-config
|
||||
|
||||
$(BINDIR)/fontconfig-config: fontconfig-config
|
||||
$(INSTALL_SCRIPT) $< $(BINDIR)
|
||||
|
||||
|
@ -62,5 +64,7 @@ install:: $(LIBDIR)/pkgconfig $(LIBDIR)/pkgconfig/fontconfig.pc
|
|||
$(LIBDIR)/pkgconfig:
|
||||
mkdir -p $@
|
||||
|
||||
all:: fontconfig.pc
|
||||
|
||||
$(LIBDIR)/pkgconfig/fontconfig.pc: fontconfig.pc
|
||||
$(INSTALL_DATA) $< $(LIBDIR)/pkgconfig
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
dnl
|
||||
dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.3 2002/05/21 17:48:15 keithp Exp $
|
||||
dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.4 2002/05/23 17:06:46 keithp Exp $
|
||||
dnl
|
||||
dnl Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
|
||||
dnl
|
||||
|
@ -29,7 +29,7 @@ AC_CONFIG_HEADER(config.h)
|
|||
|
||||
AC_ARG_WITH(freetype_includes, [ --with-freetype-includes=DIR Use FreeType includes in DIR], freetype_includes=$withval, freetype_includes=yes)
|
||||
AC_ARG_WITH(freetype_lib, [ --with-freetype-lib=DIR Use FreeType library in DIR], freetype_lib=$withval, freetype_lib=yes)
|
||||
AC_ARG_WITH(freetype_config, [ --with-freeetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
|
||||
AC_ARG_WITH(freetype_config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
|
||||
AC_ARG_WITH(expat, [ --with-expat=DIR Use Expat in DIR instead of xml2], expat=$withval, expat=maybe)
|
||||
AC_ARG_WITH(expat_includes, [ --with-expat-includes=DIR Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
|
||||
AC_ARG_WITH(expat_lib, [ --with-expat-lib=DIR Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#! /bin/sh
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
version=@PACKAGE_VERSION@
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
libdir="@libdir@"
|
||||
includedir="@includedir@"
|
||||
version="@PACKAGE_VERSION@"
|
||||
|
||||
usage()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue