more build fixups

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index 5fc5417..3c53424 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -106,7 +106,7 @@ environment_WindowMaker-0.80.2_$(target) += PATH=$(shell pwd)/upstream/install/$
 environment_WindowMaker-0.80.2_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
 environment_WindowMaker-0.80.2_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
 environment_WindowMaker-0.80.2_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
-environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext"
+environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext -ldl"
 make_install_WindowMaker-0.80.2_$(target) := -C WINGs install; make -C wrlib
 make_WindowMaker-0.80.2_$(target) := WINGs
 
@@ -124,8 +124,7 @@ vendor: .vendor; @true
        curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
        curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
 ifeq ($(shell uname),Linux)
-       rm -rf upstream/install/i686-pc-linux-gnu/include
-       ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+       cd upstream/install/i686-pc-linux-gnu/include; rm -rf *; ln -sf /usr/include/* .
 endif
        touch .vendor