petalinux: mc & talloc fix

diff --git a/petalinux/components/apps/mc/Makefile b/petalinux/components/apps/mc/Makefile
index 6191bfbb362e3f49ef8fc499ba33df5b5c5db9d6..a005f1a38cb116683591655106817be6eeb6a1a0 100644 (file)
--- a/petalinux/components/apps/mc/Makefile
+++ b/petalinux/components/apps/mc/Makefile
@@ -22,28 +22,26 @@ $(ARCHIVE):
        tar xf $(ARCHIVE)
        touch .unpacked
 
-PREFIX := $(shell pwd)/usr
+PREFIX := $(shell pwd)/image
 
 .configured: .unpacked
        cd $(DIR) && ./configure --host=arm-xilinx-linux-gnueabi \
                --with-screen=ncurses --disable-vfs-sfs --disable-vfs-sftp \
-               --with-sysroot=$(STAGEDIR) --without-x --without-gpm-mouse
+               --with-sysroot=$(STAGEDIR) --without-x --without-gpm-mouse \
+               --prefix=/ --exec-prefix=/usr --includedir=/usr/include --datarootdir=/usr/share
        touch .configured
-.built .files: .configured
-       cd $(DIR) && $(MAKE) && $(MAKE) install DESTDIR=$(PREFIX)
-       find usr -not -type d >.files
-       cp -R -t $(STAGEDIR)/usr $(PREFIX)/*
-       rm -R $(PREFIX)
+.built: .configured
+       cd $(DIR) && $(MAKE)
        touch .built
-.installed: .built .files
+.installed: .built
+       cd $(DIR) && $(MAKE) install DESTDIR=$(PREFIX)
+       (cd $(PREFIX) && find . -not -type d) >.files
+       cp -R -t $(STAGEDIR) $(PREFIX)/*
+       rm -R $(PREFIX)
        while read f; do \
-               #  if [ -L $$f ]; then TYPE=-s; \
-               #elif [ -d $$f ]; then continue; \
-               #elif [ -f $$f ]; then TYPE=-f; \
-               #fi; \
                $(TARGETINST) -d $(STAGEDIR)/$$f /$$f; \
        done <.files
-       touch .installed
+       #touch .installed
 
 install: .installed
 

diff --git a/petalinux/components/libs/talloc/Makefile b/petalinux/components/libs/talloc/Makefile
index 77468293b1028a9bae6d9df3b99a08f5c380f839..666bb3e187f1bf5b41a16dc4c14fc144ba9fec73 100644 (file)
--- a/petalinux/components/libs/talloc/Makefile
+++ b/petalinux/components/libs/talloc/Makefile
@@ -28,7 +28,7 @@ $(ARCHIVE):
        touch .built
 .installed: .built
        cd $(DIR) && python2 ./buildtools/bin/waf install
-       touch .installed
+       #touch .installed
 
 install: .installed
        for f in $(L).$(VER); do $(TARGETINST) -d $(STAGEDIR)/usr/lib/$$f /usr/lib/$$f; done