[Gsrc-commit] trunk r8938: lib gsrc adjust

[Carl Hansen]

------------------------------------------------------------
revno: 8938
revision-id: carlhansen1234@gmail.com-20230112084340-r8iemch3g1cgh8pb
parent: carlhansen1234@gmail.com-20230112074742-dkrotf4a3huctzzi
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2023-01-12 00:43:40 -0800
message:
  lib gsrc adjust
modified:
  gar/gar.env.mk                 gar.env.mk-20160617013739-wvc0o4a3snqz0iin-1
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1

=== modified file 'gar/gar.env.mk'
--- a/gar/gar.env.mk    2023-01-09 20:24:10 +0000
+++ b/gar/gar.env.mk    2023-01-12 08:43:40 +0000
@@ -31,7 +31,10 @@
 endif
 
 # Configure pkg-config, wrapped by GARStow's fake-pkg-config script.
-PKG_CONFIG := pkg-config
+#PKG_CONFIG := pkg-config
+# retro:::: illogical
+PKG_CONFIG := $(prefix)/bin/pkg-config
+
 PKG_CONFIG_PATH := 
$(prefix)/lib/pkgconfig:$(prefix)/share/pkgconfig:$(PKG_CONFIG_PATH)
 FAKE_PKG_CONFIG_LOG = $(CURDIR)/$(COOKIEDIR)/fpc.log
 

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-12-27 02:32:25 +0000
+++ b/gar/gar.lib.mk    2023-01-12 08:43:40 +0000
@@ -754,7 +754,7 @@
                        echo dest $$dest ; \
                        echo  echoing .... mkdir -p $$src `dirname $$dest`; \
             mkdir -p $$src `dirname $$dest`; \
-            rm -f $$dest; \
+               rm -rf $$dest;   \
             ln -sf $$src $$dest; \
             shift; shift; \
         done $(OUTPUT)
@@ -762,6 +762,12 @@
 #$(MAKECOOKIE)
 
 
+#carl rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
+       #@echo note, before copying.. ls  -Ra
+       #ls -Ra $(packageDESTDIR)$(prefix) 
+       #@echo note, after copying.. ls -Ra
+       #ls -Ra $(packageDESTDIR)$(prefix) $(packagedir)
+
 finish-package-install: 
        @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area packageDESTDIR to packagedir$(OFF)\n"
        @set -e; \
@@ -769,19 +775,14 @@
         while [ "$$1" != "" ]; do \
             echo echoing .... finish-package-install to packages t 1  $$1 and 
2 $$2; \
             rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
-            rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
             shift; shift; \
         done $(OUTPUT)
        @echo packagedir is $(packagedir)
        rm -rvf $(packagedir) $(OUTPUT)
        mkdir -p $(packagedir) $(OUTPUT)
-       #@echo note, before copying.. ls  -Ra
-       #ls -Ra $(packageDESTDIR)$(prefix) 
        cp -a $(packageDESTDIR)$(prefix)/* $(packagedir)
-       #@echo note, after copying.. ls -Ra
-       #ls -Ra $(packageDESTDIR)$(prefix) $(packagedir)
-       rm -rvf $(packageDESTDIR) $(OUTPUT); # is this right, advised?
-       @echo done..
+       rm -vrf $(packageDESTDIR) $(OUTPUT); # is this right, advised?
+       @echo done fpi..
 
 #$(MAKECOOKIE)