From: Paul Smith <psmith@gnu.org>
Date: Sat, 10 Sep 2022 22:27:37 +0000 (-0400)
Subject: Clean up maintMakefile
X-Git-Tag: 4.3.90~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77706874a75799b78bffc622067ca35ddab0c7f8;p=thirdparty%2Fmake.git

Clean up maintMakefile

Notes provided by Tzvetelin Katchov <katchov@gnu.org>

* maintMakefile (git-very-clean): Add -x to git clean.
(GNULIBDIR): Use GNULIB_SRCDIR, or the local module if not set.
---

diff --git a/maintMakefile b/maintMakefile
index 99d649b6..83eab90f 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -17,9 +17,6 @@ GPG_KEYID := 80CB727A20C79BB2
 # SRCROOTDIR is just a handy location to keep source files in
 SRCROOTDIR ?= $(HOME)/src
 
-# Where the gnulib project has been locally cloned
-GNULIBDIR ?= $(SRCROOTDIR)/gnulib
-
 # Where to put the CVS checkout of the GNU web repository
 GNUWEBDIR ?= $(SRCROOTDIR)/gnu-www
 
@@ -118,13 +115,16 @@ GIT :=	git
 git-clean:
 	-$(GIT) clean -fdX
 git-very-clean: git-clean
-	-$(GIT) clean -fd
+	-$(GIT) clean -fdx
 
 
 ## ---------------------- ##
 ## Generating ChangeLog.  ##
 ## ---------------------- ##
 
+# Where the gnulib project has been locally cloned
+GNULIBDIR ?= $(or $(wildcard $(GNULIB_SRCDIR)),./gnulib)
+
 gl2cl-date := 2013-10-10
 gl2cl := $(GNULIBDIR)/build-aux/gitlog-to-changelog