[Gsrc-commit] trunk r4948: mesonninja,mk fixes

[Carl Hansen]

------------------------------------------------------------
revno: 4948
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Thu 2017-11-09 01:16:18 -0800
message:
  mesonninja,mk fixes
modified:
  gar/gar.lib/mesonninja.mk      mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1

=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2017-10-30 07:00:25 +0000
+++ b/gar/gar.lib/mesonninja.mk 2017-11-09 09:16:18 +0000
@@ -1,37 +1,49 @@
+
+# still being experimented with, nothing's perfect
+# why it NEEDS this, I do not know:
 LC_ALL=C.UTF-8
+LOCALLOCALE="C.UTF-8"
+
 WORKOBJ = $(WORKSRC).build
 CONFIGURE_SCRIPTS = mes
 BUILD_SCRIPTS = nin
 INSTALL_SCRIPTS = ninj
 
-MESON_BUILD_ROOT = $(PWD)/$(WORKOBJ)
-DESTDIR=$(packageprefix)
+#MESON_BUILD_ROOT = $(PWD)/$(WORKOBJ)
 include ../../../gar/gar.mk
 
-# why it NEEDS this, I do not know
-LOCALLOCALE="C.UTF-8"
 
 configure-mes: 
-       echo ----------------------------------------------
-       echo $(prefix) $(packageprefix) $(DESTDIR) work: $(WORKOBJ)
+       echo conf.mes----------------------------------------------
+       echo $(prefix) $(packageprefix)  work: $(WORKOBJ)
        echo ----------------------------------------------
        echo ----------------------------------------------
        mkdir -p $(WORKOBJ)
        echo meson  $(WORKSRC) $(WORKOBJ)
        #LC_ALL=C.UTF-8  meson setup   $(WORKSRC) $(WORKOBJ)
        LC_ALL=$(LOCALLOCALE)  meson setup --prefix=$(packageprefix)  
$(WORKSRC) $(WORKOBJ)
-       #LC_ALL=C.UTF-8  meson setup --prefix=$(prefix)  $(WORKSRC) $(WORKOBJ)
+       #LC_ALL=$(LOCALLOCALE)   meson setup --prefix=$(prefix)  $(WORKSRC) 
$(WORKOBJ)
        $(MAKECOOKIE)
 
+# .pc files no handled correctly
+#  by meson , due to double destination dir...... arghg
+post-configure: configure-mes
+       echo find----- a little hairy for make , maybe, but it works 
---------------------------
+       for fi in `find -name \*.pc`; do \
+           echo $$fi ; \
+          sed -i 's*=$(packageprefix)*=$(prefix)*g' $$fi ; \
+          done
+       echo end find----------------------------------------------
+
+
 build-nin: 
        echo ----------------------------------------------
        echo ----------------------------------------------
        echo ----------------------------------------------
-       echo ----------------------------------------------
        echo --build-nin--------------------------------------------
        echo LC_ALL=C.UTF-8   ninja 
        #LC_ALL=C.UTF-8   ninja  -v  -C  ${MESON_BUILD_ROOT}
-       cd  $(WORKOBJ)
+       cd  $(WORKOBJ) && pwd
        pwd
        LC_ALL=$(LOCALLOCALE)   ninja   -v  -C $(WORKOBJ) 
        echo ----------------------------------------------
@@ -44,7 +56,6 @@
        echo ----------------------------------------------
        echo ----------------------------------------------
        echo  $(WORKOBJ)   ninja -v install  
-       echo $(DESTDIR)
        echo ----------install nin------------------------------------
        (cd $(WORKOBJ) ;  LC_ALL=$(LOCALLOCALE)  ninja -v install ) 
        $(MAKECOOKIE)