X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=646b3d3026e5f9c999a15d3c2e8cc3e762628e2a;hb=9441df61728a22747f28a713b6c00b1732acbd57;hp=8c4eb65c677564754bf0652720e4505271ad393d;hpb=9727555f30daf958f4817b28069ad36e871d65e8;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index 8c4eb65..646b3d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,8 @@ ldscripts_DATA = libust.so libust-initializer.o
 
 CLEANFILES = $(ldscripts_DATA)
 
-libust_FORMAT := $(shell case $(shell uname -m) in (i*86) echo elf32-i386 ;; (x86_64) echo elf64-x86-64 ;; (ppc) echo elf32-powerpc ;; (ppc64) echo elf64-powerpc ;; (s390) echo elf32-s390 ;; (s390x) echo elf64-s390 ;; esac)
 libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@${libust_FORMAT}@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
 
 libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -c -I$(top_builddir)/include -o $@ $<
+	$(CC) $(CFLAGS) -c -I$(top_srcdir)/include -o $@ $<