mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-08 18:28:43 +00:00
A batch of font packages updates, only build-system related:
font-adobe-100dpi 1.0.1 font-adobe-75dpi 1.0.1 font-adobe-utopia-100dpi 1.0.2 font-adobe-utopia-75dpi 1.0.2 font-adobe-utopia-type1 1.0.2 font-arabic-misc 1.0.1 font-bh-100dpi 1.0.1 font-bh-75dpi 1.0.1 font-bh-lucidatypewriter-100dpi 1.0.1 font-bh-lucidatypewriter-75dpi 1.0.1 font-bh-ttf 1.0.1 font-bh-type1 1.0.1 font-bitstream-100dpi 1.0.1 font-bitstream-75dpi 1.0.1 font-bitstream-type1 1.0.1 font-cronyx-cyrillic 1.0.1 font-cursor-misc 1.0.1 font-daewoo-misc 1.0.1 font-dec-misc 1.0.1 font-ibm-type1 1.0.1 font-isas-misc 1.0.1 font-jis-misc 1.0.1 font-micro-misc 1.0.1 font-misc-cyrillic 1.0.1 font-misc-ethiopic 1.0.1 font-misc-meltho 1.0.1 font-mutt-misc 1.0.1 font-screen-cyrillic 1.0.2 font-sony-misc 1.0.1 font-sun-misc 1.0.1 font-winitzki-cyrillic 1.0.1 font-xfree86-type1 1.0.2
This commit is contained in:
@@ -1,21 +1,130 @@
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 442d80e6990cfb4d0c4cbc8673bc62d63cc35458
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Sat Oct 10 17:33:43 2009 -0700
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
font-bitstream-type1 1.0.1
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 43a8529507b903e9b80fd896ac9b5ad512c3e620
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Oct 7 15:17:49 2009 -0700
|
||||
|
||||
* configure.ac:
|
||||
Add m4 magic to allow AS_HELP_STRING to work with older versions
|
||||
of autoconf 2.57.
|
||||
Migrate to xorg macros 1.3 & font-util 1.1 macros
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 72527a36fa191284f940c9cf66953861dbf6fe4a
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Oct 6 19:14:27 2009 -0700
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Add pointers to mailing lists, bugzilla, & git to README
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit dbca5ca974d6cec77357082a6f86a2e0259e451a
|
||||
Author: Ryan Hill <dirtyepic@gentoo.org>
|
||||
Date: Sun Aug 16 14:48:15 2009 -0600
|
||||
|
||||
* Makefile.am:
|
||||
* configure.ac:
|
||||
Add configure option to change the installed font dir.
|
||||
bitstream-type1: Skip fc-cache with DESTDIR.
|
||||
|
||||
Fontconfig-2.7.0 runs chmod on the cachedir, causing access violations
|
||||
when installing into a sandboxed environment.
|
||||
|
||||
Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
|
||||
Signed-off-by: Rémi Cardona <remi@gentoo.org>
|
||||
|
||||
commit fca975ffcac8a4455c24300396e652e646c8476c
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Tue Jan 27 19:11:07 2009 -0200
|
||||
|
||||
Janitor: Correct make distcheck and configure.ac simplification
|
||||
|
||||
commit aee9204788007ebb2fbe842108735e36672c9215
|
||||
Author: Andres Salomon <dilinger@debian.org>
|
||||
Date: Sat Oct 25 20:50:21 2008 +0200
|
||||
|
||||
Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found
|
||||
|
||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||
|
||||
commit 59ef1c711cc8382ee603d10b90709f6357c9df92
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:37:52 2007 -0500
|
||||
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
commit b90e48819b0a52139f290116fac44a533e566b25
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:53:06 2007 -0400
|
||||
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
commit f90da3ecb3f344922f48218eef0603a2069b1e13
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Aug 23 19:26:26 2007 -0400
|
||||
|
||||
Rename .cvsignore to .gitignore
|
||||
|
||||
commit 790a52d9740fc6772caa5d9a2db1c3faa72639c2
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:23 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 2cadeab4c3d6b5490f697959ed5ddd897d344f09
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 17:08:52 2005 +0000
|
||||
|
||||
Add m4 magic to allow AS_HELP_STRING to work with older versions of
|
||||
autoconf 2.57.
|
||||
|
||||
commit 2f6d282826cf3746c0611eeb442ad7c9482a050e
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:39 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit 3fcfbaa507cdfe59a0caec80d2d7ebd65b6ce118
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Tue Nov 22 02:00:19 2005 +0000
|
||||
|
||||
Add .cvsignores for fonts.
|
||||
|
||||
commit 8224335cc21ebb6a3e68dd634ff0846f2fecd834
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Nov 15 08:29:17 2005 +0000
|
||||
|
||||
Add configure option to change the installed font dir.
|
||||
|
||||
commit 28e98a4f2d36a508243df045d496a51b6f7509cd
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:47 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit 45cc6669398ada16c81cea99464a7accf753434b
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Jun 30 22:28:07 2005 +0000
|
||||
|
||||
Initial build system files for font module
|
||||
|
||||
commit 86efdda71cba55dc91f8c3e4d6d21656d7c6f520
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:42 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit c9c05992f6d2e2df72f642b2e3aa18de69d9c439
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:35 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@@ -40,14 +40,24 @@ FONT_FILES = \
|
||||
fontdir = @FONTDIR@
|
||||
font_DATA = $(FONT_FILES)
|
||||
|
||||
EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh
|
||||
EXTRA_DIST = $(FONT_FILES) Copyright
|
||||
|
||||
install-data-hook:
|
||||
@rm -f $(DESTDIR)$(fontdir)/fonts.scale
|
||||
$(MKFONTSCALE) $(DESTDIR)$(fontdir)
|
||||
@rm -f $(DESTDIR)$(fontdir)/font.dir
|
||||
$(MKFONTDIR) $(DESTDIR)$(fontdir)
|
||||
$(FCCACHE) $(DESTDIR)$(fontdir)
|
||||
@RUN_FCCACHE@
|
||||
|
||||
distuninstallcheck:
|
||||
@:
|
||||
|
||||
EXTRA_DIST += ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@@ -55,17 +55,20 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
subdir = .
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
|
||||
ChangeLog INSTALL NEWS install-sh missing mkinstalldirs
|
||||
ChangeLog INSTALL NEWS config.guess config.sub install-sh \
|
||||
missing
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
configure.lineno configure.status.lineno
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
mkinstalldirs = $(SHELL) $(install_sh) -d
|
||||
CONFIG_CLEAN_FILES =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
@@ -90,31 +93,62 @@ GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FCCACHE = @FCCACHE@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
FONTDIR = @FONTDIR@
|
||||
FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
MKFONTDIR = @MKFONTDIR@
|
||||
MKFONTSCALE = @MKFONTSCALE@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
@@ -122,30 +156,53 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RUN_FCCACHE = @RUN_FCCACHE@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
am__tar = @am__tar@
|
||||
am__untar = @am__untar@
|
||||
bindir = @bindir@
|
||||
build = @build@
|
||||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@@ -170,7 +227,8 @@ FONT_FILES = \
|
||||
|
||||
fontdir = @FONTDIR@
|
||||
font_DATA = $(FONT_FILES)
|
||||
EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh
|
||||
EXTRA_DIST = $(FONT_FILES) Copyright ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -261,6 +319,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@@ -380,6 +441,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic mostlyclean-am
|
||||
@@ -432,10 +494,10 @@ ps-am:
|
||||
uninstall-am: uninstall-fontDATA uninstall-info-am
|
||||
|
||||
.PHONY: all all-am am--refresh check check-am clean clean-generic dist \
|
||||
dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
|
||||
distcheck distclean distclean-generic distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am \
|
||||
dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
|
||||
dist-zip distcheck distclean distclean-generic distcleancheck \
|
||||
distdir distuninstallcheck dvi dvi-am html html-am info \
|
||||
info-am install install-am install-data install-data-am \
|
||||
install-data-hook install-exec install-exec-am \
|
||||
install-fontDATA install-info install-info-am install-man \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
@@ -449,10 +511,17 @@ install-data-hook:
|
||||
$(MKFONTSCALE) $(DESTDIR)$(fontdir)
|
||||
@rm -f $(DESTDIR)$(fontdir)/font.dir
|
||||
$(MKFONTDIR) $(DESTDIR)$(fontdir)
|
||||
$(FCCACHE) $(DESTDIR)$(fontdir)
|
||||
@RUN_FCCACHE@
|
||||
|
||||
distuninstallcheck:
|
||||
@:
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/font/bitstream-type1
|
||||
|
||||
http://cgit.freedesktop.org/xorg/font/bitstream-type1
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
|
||||
1860
font/bitstream-type1/aclocal.m4
vendored
1860
font/bitstream-type1/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,12 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
autoreconf -v --install || exit 1
|
||||
cd $ORIGDIR || exit $?
|
||||
|
||||
$srcdir/configure --enable-maintainer-mode "$@"
|
||||
1463
font/bitstream-type1/config.guess
vendored
Normal file
1463
font/bitstream-type1/config.guess
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1579
font/bitstream-type1/config.sub
vendored
Normal file
1579
font/bitstream-type1/config.sub
vendored
Normal file
File diff suppressed because it is too large
Load Diff
6096
font/bitstream-type1/configure
vendored
6096
font/bitstream-type1/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -22,25 +22,24 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(font-bitstream-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-type1)
|
||||
AC_INIT(font-bitstream-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-type1)
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AC_PATH_PROG(MKFONTSCALE, mkfontscale)
|
||||
AC_PATH_PROG(MKFONTDIR, mkfontdir)
|
||||
AC_PATH_PROG(FCCACHE, fc-cache)
|
||||
# Require X.Org's font util macros 1.1 or later
|
||||
m4_ifndef([XORG_FONT_MACROS_VERSION],
|
||||
[m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
|
||||
XORG_FONT_MACROS_VERSION(1.1)
|
||||
|
||||
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
|
||||
|
||||
DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1
|
||||
AC_ARG_WITH(fontdir,
|
||||
AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]),
|
||||
[FONTDIR="$withval"],
|
||||
[FONTDIR="$DEFAULT_FONTDIR"])
|
||||
AC_SUBST(FONTDIR)
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_FONTDIR([Type1])
|
||||
XORG_FONT_SCALED_UTILS
|
||||
|
||||
AC_OUTPUT([Makefile])
|
||||
|
||||
@@ -1,158 +0,0 @@
|
||||
#! /bin/sh
|
||||
# mkinstalldirs --- make directory hierarchy
|
||||
|
||||
scriptversion=2005-06-29.22
|
||||
|
||||
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
||||
# Created: 1993-05-16
|
||||
# Public domain.
|
||||
#
|
||||
# This file is maintained in Automake, please report
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
errstatus=0
|
||||
dirmode=
|
||||
|
||||
usage="\
|
||||
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
|
||||
|
||||
Create each directory DIR (with mode MODE, if specified), including all
|
||||
leading file name components.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>."
|
||||
|
||||
# process command line arguments
|
||||
while test $# -gt 0 ; do
|
||||
case $1 in
|
||||
-h | --help | --h*) # -h for help
|
||||
echo "$usage"
|
||||
exit $?
|
||||
;;
|
||||
-m) # -m PERM arg
|
||||
shift
|
||||
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
|
||||
dirmode=$1
|
||||
shift
|
||||
;;
|
||||
--version)
|
||||
echo "$0 $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
--) # stop option processing
|
||||
shift
|
||||
break
|
||||
;;
|
||||
-*) # unknown option
|
||||
echo "$usage" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
*) # first non-opt arg
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
for file
|
||||
do
|
||||
if test -d "$file"; then
|
||||
shift
|
||||
else
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
case $# in
|
||||
0) exit 0 ;;
|
||||
esac
|
||||
|
||||
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
|
||||
# mkdir -p a/c at the same time, both will detect that a is missing,
|
||||
# one will create a, then the other will try to create a and die with
|
||||
# a "File exists" error. This is a problem when calling mkinstalldirs
|
||||
# from a parallel make. We use --version in the probe to restrict
|
||||
# ourselves to GNU mkdir, which is thread-safe.
|
||||
case $dirmode in
|
||||
'')
|
||||
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
||||
echo "mkdir -p -- $*"
|
||||
exec mkdir -p -- "$@"
|
||||
else
|
||||
# On NextStep and OpenStep, the `mkdir' command does not
|
||||
# recognize any option. It will interpret all options as
|
||||
# directories to create, and then abort because `.' already
|
||||
# exists.
|
||||
test -d ./-p && rmdir ./-p
|
||||
test -d ./--version && rmdir ./--version
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
|
||||
test ! -d ./--version; then
|
||||
echo "mkdir -m $dirmode -p -- $*"
|
||||
exec mkdir -m "$dirmode" -p -- "$@"
|
||||
else
|
||||
# Clean up after NextStep and OpenStep mkdir.
|
||||
for d in ./-m ./-p ./--version "./$dirmode";
|
||||
do
|
||||
test -d $d && rmdir $d
|
||||
done
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
for file
|
||||
do
|
||||
case $file in
|
||||
/*) pathcomp=/ ;;
|
||||
*) pathcomp= ;;
|
||||
esac
|
||||
oIFS=$IFS
|
||||
IFS=/
|
||||
set fnord $file
|
||||
shift
|
||||
IFS=$oIFS
|
||||
|
||||
for d
|
||||
do
|
||||
test "x$d" = x && continue
|
||||
|
||||
pathcomp=$pathcomp$d
|
||||
case $pathcomp in
|
||||
-*) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp"
|
||||
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
else
|
||||
if test ! -z "$dirmode"; then
|
||||
echo "chmod $dirmode $pathcomp"
|
||||
lasterr=
|
||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -z "$lasterr"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
pathcomp=$pathcomp/
|
||||
done
|
||||
done
|
||||
|
||||
exit $errstatus
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# End:
|
||||
Reference in New Issue
Block a user