pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files + ERROR: Other Makefiles must n...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b4e7acd9f94
branches:  trunk
changeset: 504532:7b4e7acd9f94
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Dec 12 21:36:45 2005 +0000

description:
+ ERROR: Other Makefiles must not be included. Use Makefile.common instead.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 9cc2b4a0953b -r 7b4e7acd9f94 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Dec 12 21:32:20 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Dec 12 21:36:45 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.435 2005/12/09 08:40:40 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.436 2005/12/12 21:36:45 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1599,6 +1599,7 @@
        my ($line, $text) = @_;
        my ($vartools, $state, $rest);
 
+       # Note: SCST is the abbreviation for [S]hell [C]ommand [ST]ate.
        use constant SCST_START         =>  0;
        use constant SCST_CONT          =>  1;
        use constant SCST_INSTALL       => 10;
@@ -2452,6 +2453,15 @@
                        $line->log_debug("includefile=${includefile}");
                        checkline_relative_path($line, $includefile);
 
+                       if ($includefile =~ qr"../Makefile$") {
+                               $line->log_error("Other Makefiles must not be included.");
+                               $line->explain(
+                                       "If you want to include portions of another Makefile, extract",
+                                       "the common parts and put them into a Makefile.common. After",
+                                       "that, both this one and the other package should include the",
+                                       "Makefile.common.");
+                       }
+
                } elsif ($text =~ qr"^\.\s*(if|ifdef|ifndef|else|elif|endif|for|endfor|undef)(?:\s+([^\s#][^#]*?))?\s*(?:#.*)?$") {
                        my ($directive, $args) = ($1, $2);
 



Home | Main Index | Thread Index | Old Index