[Gsrc-commit] trunk r8872: gar.lib.mk needed fixes...

[Carl Hansen]

------------------------------------------------------------
revno: 8872
revision-id: carlhansen1234@gmail.com-20221216082803-r643wghsrfdne079
parent: carlhansen1234@gmail.com-20221216082647-lzq44jv3ut17c58d
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Fri 2022-12-16 00:28:03 -0800
message:
  gar.lib.mk needed fixes...
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-12-11 00:13:51 +0000
+++ b/gar/gar.lib.mk    2022-12-16 08:28:03 +0000
@@ -740,7 +740,7 @@
 
 # ?? what is this doing?
 prepare-install:
-       @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging area 
DESTDIR...$(OFF)\n"
+       @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging area 
packageDESTDIR...$(OFF)\n"
        rm -fr $(packageDESTDIR)
        mkdir -p $(packageDESTDIR)$(prefix)
        @set -e; \
@@ -761,7 +761,7 @@
 
 
 finish-package-install: 
-       @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area DESTDIR to packages$(OFF)\n"
+       @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area packageDESTDIR to packagedir$(OFF)\n"
        @set -e; \
         set -- $(CREATED_MERGE_DIRS); \
         while [ "$$1" != "" ]; do \
@@ -770,10 +770,17 @@
             rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
             shift; shift; \
         done $(OUTPUT)
+       @echo packagedir is $(packagedir)
        rm -rvf $(packagedir) $(OUTPUT)
-       echo note , before copying..
-       cp -a $(packageDESTDIR)$(prefix) $(packagedir)
+       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)
+       @echo done..
+
        
 
 GNU_INSTALL_ARGS = \