[Guile-commits] 01/02: build: Check for /gnu/store file names upon "make dist".

[Ludovic Courtès]

civodul pushed a commit to branch stable-2.0
in repository guile.

commit 5c6bd9598d5b58348069f16baa9b3a4e07dd9e9a
Author: Ludovic Courtès <address@hidden>
Date:   Wed Oct 12 12:01:54 2016 +0200

    build: Check for /gnu/store file names upon "make dist".
    
    * Makefile.am (assert-no-store-file-names): New rule, taken from Guix.
    (dist-hook): Depend on it.
---
 Makefile.am |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8f9e014..e58489f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 ##
 ##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007,
 ##        2008, 2009, 2010, 2011, 2012, 2013,
-##        2014 Free Software Foundation, Inc.
+##        2014, 2016 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -88,7 +88,7 @@ DISTCLEANFILES = check-guile.log
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning
 
-dist-hook: gen-ChangeLog gen-tarball-version
+dist-hook: gen-ChangeLog gen-tarball-version assert-no-store-file-names
 
 clean-local:
        rm -rf cache/
@@ -105,6 +105,16 @@ gen-ChangeLog:
          mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
        fi
 
+# Make sure we're not shipping a file that embeds a /gnu/store file
+# name, for maintainers who use Guix.
+.PHONY: assert-no-store-file-names
+assert-no-store-file-names:
+       if grep -rE "/gnu/store/[a-z0-9]{32}-" $(distdir) ;                     
\
+       then                                                                    
\
+         echo "error: store file names embedded in the distribution" >&2 ;     
\
+         exit 1 ;                                                              
\
+       fi
+
 BUILT_SOURCES += $(top_srcdir)/.version
 $(top_srcdir)/.version:
        echo $(VERSION) > address@hidden && mv address@hidden $@