automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: fix VPATH install of nobase_ files with Sun and OSF1/Tru64 Make (HE


From: Alexandre Duret-Lutz
Subject: FYI: fix VPATH install of nobase_ files with Sun and OSF1/Tru64 Make (HEAD)
Date: Mon, 05 Jan 2004 22:47:31 +0100
User-agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux)

I'm installing this on HEAD.  A more conservative fix will
follow for branch-1-8.

2004-01-05  Alexandre Duret-Lutz  <address@hidden>

        * lib/am/inst-vars.am: New file, define am__vpath_adj_setup,
        am__vpath_adj, and am__strip_dir.
        * lib/am/Makefile.am (dist_am_DATA): Add inst-vars.am.
        * lib/am/data.am, lib/am/lisp.am, lib/am/python.am,
        lib/am/scripts.am: Include inst-vars.am, and use $(am__vpath_adj),
        $(am__vpath_adj_setup), and $(am__strip_dir) in install and
        uninstall rules.  This fixes installation of nobase_ files in
        VPATH setups with Sun and OSF1/Tru64 Make.
        * lib/am/libs.am, lib/am/ltlib.am: Include inst-vars.am, and use
        $(am__strip_dir) to simplify install and uninstall rules.
        * tests/nobase.test: Augment to check installation from VPATH builds.

Index: lib/am/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/Makefile.am,v
retrieving revision 1.171
diff -u -r1.171 Makefile.am
--- lib/am/Makefile.am  2 Jun 2003 07:08:40 -0000       1.171
+++ lib/am/Makefile.am  5 Jan 2004 21:43:15 -0000
@@ -2,7 +2,7 @@
 
 ## Makefile for Automake lib/am.
 
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003
+## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -22,10 +22,42 @@
 
 amdir = $(pkgvdatadir)/am
 
-dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \
-configure.am data.am dejagnu.am depend.am depend2.am distdir.am \
-footer.am header-vars.am header.am install.am java.am lang-compile.am \
-lex.am library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
-mans-vars.am mans.am multilib.am program.am progs.am python.am \
-remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \
-texinfos.am yacc.am
+dist_am_DATA = \
+ansi2knr.am \
+check.am \
+clean-hdr.am \
+clean.am \
+compile.am \
+configure.am \
+data.am \
+dejagnu.am \
+depend.am \
+depend2.am \
+distdir.am \
+footer.am \
+header-vars.am \
+header.am \
+install.am \
+java.am \
+lang-compile.am \
+lex.am \
+library.am \
+libs.am \
+libtool.am \
+lisp.am \
+ltlib.am \
+ltlibrary.am \
+mans-vars.am \
+mans.am \
+multilib.am \
+program.am \
+progs.am \
+python.am \
+remake-hdr.am \
+scripts.am \
+subdirs.am \
+tags.am \
+texi-vers.am \
+texibuild.am \
+texinfos.am \
+yacc.am
Index: lib/am/data.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/data.am,v
retrieving revision 1.41
diff -u -r1.41 data.am
--- lib/am/data.am      10 Nov 2003 20:55:32 -0000      1.41
+++ lib/am/data.am      5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,10 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+include inst-vars.am
+endif %?INSTALL%
+
 ## ------------ ##
 ## Installing.  ##
 ## ------------ ##
@@ -30,16 +34,18 @@
 install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
        @$(NORMAL_INSTALL)
        $(mkdir_p) $(DESTDIR)$(%NDIR%dir)
+?!BASE?        @$(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+?!BASE?        list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
 ## A file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ## If the _%PRIMARY% variable has an entry like foo/bar, install it as
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can make a
 ## new dir variable or use a nobase_ target for the latter case.
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
+?BASE?   f=$(am__strip_dir) \
+?!BASE?          $(am__vpath_adj) \
          echo " $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
          $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
@@ -54,9 +60,11 @@
 .PHONY uninstall-am: uninstall-%DIR%%PRIMARY%
 uninstall-%DIR%%PRIMARY%:
        @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
+?!BASE?        @$(am__vpath_adj_setup) \
+?!BASE?        list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+?BASE?   f=$(am__strip_dir) \
+?!BASE?          $(am__vpath_adj) \
          echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
          rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
Index: lib/am/inst-vars.am
===================================================================
RCS file: lib/am/inst-vars.am
diff -N lib/am/inst-vars.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/am/inst-vars.am 5 Jan 2004 21:43:15 -0000
@@ -0,0 +1,30 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright (C) 2004  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, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+if %?FIRST%
+## These variables help stripping any $(VPATH) that some
+## Make implementations prepend before VPATH-found files.
+## The issue is discussed at length in distdir.am.
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+## Strip all directories.
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+endif %?FIRST%
Index: lib/am/libs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/libs.am,v
retrieving revision 1.25
diff -u -r1.25 libs.am
--- lib/am/libs.am      10 Nov 2003 20:55:32 -0000      1.25
+++ lib/am/libs.am      5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+include inst-vars.am
+endif %?INSTALL%
 
 ## ----------- ##
 ## Variables.  ##
@@ -49,8 +52,8 @@
 ## Compute basename of source file.  Unless this is a nobase_ target, we
 ## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.yo',
 ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'.
-?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?            f="$$p"; \
+?BASE?     f=$(am__strip_dir) \
+?!BASE?            f=$$p; \
            echo " $(%DIR%LIBRARIES_INSTALL) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
            $(%DIR%LIBRARIES_INSTALL) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
          else :; fi; \
@@ -63,7 +66,7 @@
        @$(POST_INSTALL)
        @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-?BASE?     p="`echo $$p | sed -e 's|^.*/||'`"; \
+?BASE?     p=$(am__strip_dir) \
 ## Must ranlib after installing because mod time changes.
            echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \
            $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \
@@ -81,7 +84,7 @@
 uninstall-%DIR%LIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
-?BASE?   p="`echo $$p | sed -e 's|^.*/||'`"; \
+?BASE?   p=$(am__strip_dir) \
          echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
          rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
        done
Index: lib/am/lisp.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lisp.am,v
retrieving revision 1.39
diff -u -r1.39 lisp.am
--- lib/am/lisp.am      13 Nov 2003 19:39:06 -0000      1.39
+++ lib/am/lisp.am      5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003
+## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+include inst-vars.am
+endif %?INSTALL%
 
 ## ---------- ##
 ## Building.  ##
@@ -61,13 +64,14 @@
 ## Do not install anything if EMACS was not found.
        @if test "$(EMACS)" != no; then \
          $(mkdir_p) $(DESTDIR)$(%NDIR%dir); \
+?!BASE?          $(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
          list='$(%DIR%_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
            if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?            f="$$p"; \
+?BASE?     f=$(am__strip_dir) \
+?!BASE?            $(am__vpath_adj) \
            echo " $(%DIR%LISP_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
            $(%DIR%LISP_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
 ## Only install .elc file if it exists.
@@ -90,9 +94,10 @@
        @$(NORMAL_UNINSTALL)
 ## Do not uninstall anything if EMACS was not found.
        @if test "$(EMACS)" != no; then \
+?!BASE?          $(am__vpath_adj_setup) \
          list='$(%DIR%_LISP)'; for p in $$list; do \
-?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?            f="$$p"; \
+?BASE?     f=$(am__strip_dir) \
+?!BASE?            $(am__vpath_adj) \
            echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f 
$(DESTDIR)$(%NDIR%dir)/$${f}c"; \
            rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
          done; \
Index: lib/am/ltlib.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/ltlib.am,v
retrieving revision 1.28
diff -u -r1.28 ltlib.am
--- lib/am/ltlib.am     10 Nov 2003 20:55:32 -0000      1.28
+++ lib/am/ltlib.am     5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,10 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+include inst-vars.am
+endif %?INSTALL%
+
 ## ------------ ##
 ## Installing.  ##
 ## ------------ ##
@@ -37,8 +41,8 @@
 ## Compute basename of source file.  Unless this is a nobase_ target, we
 ## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.yo',
 ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'.
-?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?            f="$$p"; \
+?BASE?     f=$(am__strip_dir) \
+?!BASE?            f=$$p; \
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
@@ -60,8 +64,8 @@
 .PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES
 uninstall-%DIR%LTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-?BASE?     p="`echo $$p | sed -e 's|^.*/||'`"; \
+       @set -x; list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
+?BASE?   p=$(am__strip_dir) \
 ?LIBTOOL?        echo " $(LIBTOOL) --mode=uninstall rm -f 
$(DESTDIR)$(%NDIR%dir)/$$p"; \
 ?LIBTOOL?        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p; 
\
 ?!LIBTOOL?       echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
Index: lib/am/python.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/python.am,v
retrieving revision 1.18
diff -u -r1.18 python.am
--- lib/am/python.am    10 Nov 2003 20:55:32 -0000      1.18
+++ lib/am/python.am    5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1999, 2001, 2003, 2004 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
@@ -16,6 +16,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+include inst-vars.am
+endif %?INSTALL%
 
 ## ------------ ##
 ## Installing.  ##
@@ -30,19 +33,21 @@
 install-%DIR%PYTHON: $(%DIR%_PYTHON)
        @$(NORMAL_INSTALL)
        $(mkdir_p) $(DESTDIR)$(%NDIR%dir)
-       @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?!BASE?        @$(am__vpath_adj_setup) \
+?!BASE?        list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?BASE? @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
 ## A file can be in the source directory or the build directory.
          if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
          if test -f $$b$$p; then \
 ## Compute basename of source file.  Unless this is a nobase_ target, we
 ## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.py',
 ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.py'.
-?BASE?     d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-?!BASE?            d="$$p"; \
-           dlist="$$dlist $$d"; \
+?BASE?     f=$(am__strip_dir) \
+?!BASE?            $(am__vpath_adj) \
+           dlist="$$dlist $$f"; \
 ## Don't perform translation, since script name is important.
-           echo " $(%DIR%PYTHON_INSTALL) $$b$$p $(DESTDIR)$(%NDIR%dir)/$$d"; \
-           $(%DIR%PYTHON_INSTALL) $$b$$p $(DESTDIR)$(%NDIR%dir)/$$d; \
+           echo " $(%DIR%PYTHON_INSTALL) $$b$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+           $(%DIR%PYTHON_INSTALL) $$b$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
          else :; fi; \
        done; \
 ## Byte-compile must be done at install time, since file times are
@@ -59,10 +64,12 @@
 .PHONY uninstall-am: uninstall-%DIR%PYTHON
 uninstall-%DIR%PYTHON:
        @$(NORMAL_UNINSTALL)
-       list='$(%DIR%_PYTHON)'; for p in $$list; do \
-?BASE?   d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-?!BASE?          d="$$p"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$d; \
+?!BASE?        @$(am__vpath_adj_setup) \
+?!BASE?        list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?BASE? @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?BASE?   f=$(am__strip_dir); \
+?!BASE?          $(am__vpath_adj); \
+         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
 ## This is to remove the .pyc and .pyo byte compiled versions (a bit
 ## of a hack).
          rm -f $(DESTDIR)$(%NDIR%dir)/$${d}c; \
Index: lib/am/scripts.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/scripts.am,v
retrieving revision 1.51
diff -u -r1.51 scripts.am
--- lib/am/scripts.am   10 Nov 2003 20:55:32 -0000      1.51
+++ lib/am/scripts.am   5 Jan 2004 21:43:15 -0000
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,11 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+if %?INSTALL%
+if ! %?BASE%
+include inst-vars.am
+endif ! %?BASE%
+endif %?INSTALL%
 
 ## ------------ ##
 ## Installing.  ##
@@ -32,9 +37,12 @@
 install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
        @$(NORMAL_INSTALL)
        $(mkdir_p) $(DESTDIR)$(%NDIR%dir)
+?!BASE?        @$(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?        list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?          $(am__vpath_adj) p=$$f; \
 ## A file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          if test -f $$d$$p; then \
@@ -61,7 +69,10 @@
 .PHONY uninstall-am: uninstall-%DIR%SCRIPTS
 uninstall-%DIR%SCRIPTS:
        @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?        @$(am__vpath_adj_setup) \
+?!BASE?        list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?          $(am__vpath_adj) p=$$f; \
 ## Remove any leading directory before applying $(transform).
          f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 ## Prepend the directory part if nobase_ is used.
Index: tests/nobase.test
===================================================================
RCS file: /cvs/automake/automake/tests/nobase.test,v
retrieving revision 1.11
diff -u -r1.11 nobase.test
--- tests/nobase.test   14 Nov 2003 21:25:59 -0000      1.11
+++ tests/nobase.test   5 Jan 2004 21:43:16 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -38,11 +38,11 @@
 foo_HEADERS = sub/base.h
 nobase_foo_HEADERS = sub/nobase.h
 
-foo_DATA = sub/base.dat
-nobase_foo_DATA = sub/nobase.dat
+dist_foo_DATA = sub/base.dat
+nobase_dist_foo_DATA = sub/nobase.dat
 
-fooexec_SCRIPTS = sub/base.sh
-nobase_fooexec_SCRIPTS = sub/nobase.sh
+dist_fooexec_SCRIPTS = sub/base.sh
+nobase_dist_fooexec_SCRIPTS = sub/nobase.sh
 
 fooexec_PROGRAMS = sub/base
 nobase_fooexec_PROGRAMS = sub/nobase
@@ -122,3 +122,16 @@
 test `find inst/foo -type f -print | wc -l` = 0
 
 $MAKE install-strip
+
+# Likewise, in a VPATH build.
+
+$MAKE uninstall
+$MAKE distclean
+mkdir build
+cd build
+../configure --prefix `pwd`/inst --program-prefix=p
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+test `find inst/foo -type f -print | wc -l` = 0
-- 
Alexandre Duret-Lutz





reply via email to

[Prev in Thread] Current Thread [Next in Thread]