Hash :
368f1c4c
Author :
Date :
2012-03-16T23:48:53
install: don't create empty dirs when an empty 'foo_PRIMARY' is used
Fixes automake bug#11030 and bug#10997.
An empty declaration of "foo_PRIMARY" in a Makefile.am used to
cause the generated install rules to create the directory $(foodir)
anyway, even if nothing was to be installed there.
While this could be seen as a convenient way to create a $(foodir)
directory upon "make install" (respecting $(DESTDIR) settings and
such), it also caused problems with conditionals; for example, an
input of:
if FALSE
pgkdata_DATA = something
endif
caused the generated install rules to unconditionally create the
$(pkgdatadir) directory (see automake bug#10997).
Also, a user wanting to create an empty directory upon installation
can easily do so with a custom install hook, as in:
installdirs-local:
$(MKDIR_P) $(DESTDIR)$(foodir)
install-data-hook: installdirs-local
On the other hand, the old behavior of "always create $(foodir),
even if 'foo_PRIMARY' is empty" was harder and more tricky to
override.
Thus, from now on, an empty declaration of "foo_PRIMARY" will not
cause the directory $(foodir) to be created upon "make install"
anymore.
* lib/am/data.am, lib/am/java.am, lib/am/libs.am, lib/am/lisp.am,
lib/am/ltlib.am, lib/am/mans.am, lib/am/progs.am, lib/am/python.am,
lib/am/scripts.am, lib/am/texinfos.am: Adjust install rules to avoid
creating an installation directory if no files are actually to be
installed there.
* tests/instdir-empty.test: Remove, it was testing a semantic
opposite to the one we now want and implement.
* tests/instdir-no-empty.test: New test, check the new semantic.
* tests/instdir-cond.test: Enhance. Move the still-failing part
of the test ...
* tests/instdir-cond2.test: ... here.
* tests/list-of-tests.mk, tests/Makefile.am (XFAIL_TESTS): Update.
* tests/java3.test: Adjust to avoid spurious failures.
* HACKING, NEWS, THANKS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
#! /bin/sh
# Copyright (C) 2012 Free Software Foundation, Inc.
#
# 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, 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/>.
# An empty "foo_PRIMARY" declaration should *not* cause "make install"
# to create directory $(foodir). See automake bug#10997 and bug#11030.
. ./defs || Exit 1
set -e
cat >> configure.in <<END
AC_SUBST([CC], [whatever])
AC_SUBST([JAVAC], [whatever])
AM_PATH_PYTHON(,,:)
AC_OUTPUT
END
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-dependencies
mydir = $(prefix)/my
myexecdir = $(prefix)/myexec
javadir = $(prefix)/java
END
# Write Makefile.am.
{
for dir in sbin bin libexec pkglibexec myexec; do
for dst in '' dist_ nodist_; do
echo "${dst}${dir}_SCRIPTS ="
done
echo "${dir}_PROGRAMS ="
done
for dir in lib pkglib myexec my; do
echo "${dir}_LIBRARIES ="
echo "${dir}_LTLIBRARIES ="
done
for p1 in '' notrans_; do
for p2 in '' dist_ nodist_; do
for s in '' 1 2 3 4 5 6 7 8 9; do
echo "${p1}${p2}man${s}_MANS ="
done
done
done
for dst in '' dist_ nodist_; do
for dir in dataroot data pkgdata doc lisp my; do
echo "${dst}${dir}_DATA ="
done
for dir in include pkginclude oldinclude my; do
echo "${dst}${dir}_HEADERS ="
done
for dir in python my; do
echo "${dst}${dir}_PYTHON ="
done
for dir in info my; do
echo "${dst}${dir}_TEXINFOS ="
done
for dir in java my; do
echo "${dst}${dir}_JAVA ="
done
for dir in lisp my; do
echo "${dst}${dir}_LISP ="
done
done
} > t
cat t >> Makefile.am
sed 's/^/nobase_/' t >> Makefile.am
rm -f t
cat Makefile.am # For debugging.
# Sanity check.
grep '^oldinclude_HEADERS =' Makefile.am \
&& grep '^nodist_my_PYTHON =' Makefile.am \
&& grep '^notrans_dist_man5_MANS =' Makefile.am \
|| fatal_ "creating Makefile.am"
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
cwd=`pwd` || fatal_ "getting current working directory"
doinst ()
{
$MAKE install install-pdf install-ps install-dvi ${1+"$@"}
}
: > foo.sh
./configure --prefix="$cwd/inst"
doinst
test ! -d inst || { find inst; Exit 1; }
$MAKE uninstall
doinst bin_SCRIPTS=foo.sh
test -f inst/bin/foo.sh
./configure
doinst DESTDIR="$cwd/dest"
test ! -d dest || { find dest; Exit 1; }
$MAKE uninstall
doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh
test -f dest/usr/local/bin/foo.sh
: