[Gsrc-commit] trunk r8466: update gnulib to master

[Carl Hansen]

------------------------------------------------------------
revno: 8466
revision-id: carlhansen1234@gmail.com-20220628075603-dva9csxwg9vgq96n
parent: carlhansen1234@gmail.com-20220628061558-o6zseaizd6ctkzxk
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Tue 2022-06-28 00:56:03 -0700
message:
  update gnulib to master
modified:
  pkg/gnu/gnulib/Makefile        makefile-20160617014725-uokjfnggs70iry9h-828

=== modified file 'pkg/gnu/gnulib/Makefile'
--- a/pkg/gnu/gnulib/Makefile   2022-02-26 01:07:23 +0000
+++ b/pkg/gnu/gnulib/Makefile   2022-06-28 07:56:03 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2016,2020,2021 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2016,2020,2021,2022 Carl Hansen <carlhansen@gnu.org>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc
@@ -21,7 +21,7 @@
 
 NAME = gnulib
 GARNAME = gnulib
-GARVERSION = 20220225
+GARVERSION = master
 HOME_URL = http://www.gnu.org/software/gnulib/
 DESCRIPTION = Source files to share among other software projects
 define BLURB
@@ -47,51 +47,49 @@
 BUILDDEPS =
 LIBDEPS =
 
+
+DOWNLOADDIRGIT =  $(DOWNLOADDIR)-git
+WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+WORKOBJ = $(WORKSRC)
+
 ######################################################################
-# HINT: set GNULIB_SRCDIR= to the work/gnulib in your .bashrc
+
+# HINT: set GNULIB_SRCDIR= to the DOWNLOADDIRGIT/GARNAME (download-git/gnulib) 
in your .bashrc
 # for other programs to use it
 
 include ../../../gar/gar.mk
 include config.mk
-# no download directory; puts in work
-
-.PHONY:  gitpull fetch-gl   makedoc build-gl install-gl clean
-
+
+#  download directory is download-git/gnulib/.git/, not normally removed.
+#  $(DOWNLOADDIRGIT)/$(GARNAME)/
+
+.PHONY:  gitpull fetch-gl   makedoc build-gl install-gl 
 
 gitpull:
-       (cd $(WORKDIR)/$(GARNAME) &&  git pull)
-
+       (cd $(DOWNLOADDIRGIT)/$(GARNAME) &&  git pull)
 
 fetch-gl::
-       if [ -d work/$(GARNAME)/.git ]; then    $(MAKE) gitpull ;  else  \
-         (cd $(WORKDIR) &&  git clone 
https://git.savannah.gnu.org/git/$(GARNAME).git)  fi 
+       if [ -d $(DOWNLOADDIRGIT) ]; then    $(MAKE) gitpull ;  else  \
+         (mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME)  &&  cd $(DOWNLOADDIRGIT)/  && 
 git clone https://git.savannah.gnu.org/git/$(GARNAME).git)  fi 
        $(MAKECOOKIE)
 
 makedoc: fetch-gl
-       cd $(WORKDIR) && make -C ./gnulib/doc
+       make -C $(WORKSRC)/doc/
        $(MAKECOOKIE)
 
-build-gl:  fetch-gl 
-       $(MAKE) gitpull
+build-gl:  
+       $(MAKE) fetch-gl
        $(MAKE) makedoc
        $(MAKECOOKIE)
 
 
-
-install-gl:
+#install:
+pre-install:
+       @echo ------------------------------------------------------
        @echo installing gnulib.info  
-       $(INSTALL_INFO)  $(WORKDIR)/gnulib/doc/gnulib.info
-       @echo ------------------------------------------------------
-       @echo link gnulib-tool into $(prefix)/bin/
-       /bin/rm -f  $(prefix)/bin/gnulib-tool 
-       @echo cd $(WORKDIR) && ln -s $(shell pwd)/$(WORKDIR)/gnulib/gnulib-tool 
$(prefix)/bin/
-       cd $(WORKDIR) && ln --backup -s $(shell 
pwd)/$(WORKDIR)/gnulib/gnulib-tool $(prefix)/bin/
-       /bin/rm -f  $(prefix)/bin/gnulib-tool.py 
-       cd $(WORKDIR) && ln --backup -s $(shell 
pwd)/$(WORKDIR)/gnulib/gnulib-tool.py $(prefix)/bin/
+       $(INSTALL_INFO) $(WORKSRC)/doc/gnulib.info
+       $(INSTALL_BIN)  $(WORKSRC)/gnulib-tool.py
+       $(INSTALL_BIN)  $(WORKSRC)/gnulib-tool
        $(MAKECOOKIE)
 
-clean:
-       @echo "clean" disabled, not cleaning, Do it manually if you really want 
to
-       @echo Trying to preserve the git hierarchy of source in WORKSRC
-