commit 45fe1d880e87abeb4f0a95ef0b1abf6e5d4c5e4c parent 14549c5eee15ef55a995bea9b5455fc540b3649b Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Mon, 2 Jun 2014 13:57:42 +0200 use $PREFIX Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org> Diffstat:
67 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/cares/cares.mk b/cares/cares.mk @@ -10,7 +10,7 @@ cares:QV: CC="${CC} -static" CFLAGS="" ./configure \ --build="${TOOLCHAIN_TRIPLET}" \ --host="${TOOLCHAIN_TRIPLET}" \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-werror \ --disable-shared \ diff --git a/curl/curl.mk b/curl/curl.mk @@ -22,7 +22,7 @@ curl:QV: --bindir="$BINDIR" \ --sbindir="$BINDIR" \ --libexecdir="$BINDIR" \ - --mandir="$prefix/share/man" \ + --mandir="$PREFIX/share/man" \ --disable-shared \ --disable-manual \ --disable-ntlm-wb \ diff --git a/dmenu/dmenu.mk b/dmenu/dmenu.mk @@ -10,7 +10,7 @@ dmenu:QV: # overwrite default config.mk to allow overriding some variables. # TODO: use original X11INC, X11LIB override cp ../config.mk config.mk - CC="${CC} -static" make -j$nprocs PREFIX="$prefix" DESTDIR="$ROOT" + CC="${CC} -static" make -j$nprocs PREFIX="$PREFIX" DESTDIR="$ROOT" install:QV: - make -j$nprocs PREFIX="$prefix" DESTDIR="$ROOT" install + make -j$nprocs PREFIX="$PREFIX" DESTDIR="$ROOT" install diff --git a/dropbear/dropbear.mk b/dropbear/dropbear.mk @@ -16,6 +16,6 @@ dropbear:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs diff --git a/dwm/dwm.mk b/dwm/dwm.mk @@ -10,7 +10,7 @@ dwm:QV: cp ../config.mk config.mk export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="${CC} -static" make -j$nprocs PREFIX="$prefix" DESTDIR="$ROOT" + CC="${CC} -static" make -j$nprocs PREFIX="$PREFIX" DESTDIR="$ROOT" install:QV: - make -j$nprocs PREFIX="$prefix" DESTDIR="$ROOT" install + make -j$nprocs PREFIX="$PREFIX" DESTDIR="$ROOT" install diff --git a/e2fsprogs/e2fsprogs.mk b/e2fsprogs/e2fsprogs.mk @@ -9,7 +9,7 @@ e2fsprogs:QV: --bindir="$BINDIR" \ --sbindir="$BINDIR" \ --libexecdir="$BINDIR" \ - --mandir="$prefix/share/man" + --mandir="$PREFIX/share/man" make -j$nprocs install:QV: diff --git a/expat/expat.mk b/expat/expat.mk @@ -4,7 +4,7 @@ TARG = expat expat:QV: # TODO: $ROOT/bin/xmlwf is not staticly linked. - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/fontconfig/fontconfig.mk b/fontconfig/fontconfig.mk @@ -13,7 +13,7 @@ fontconfig:QV: export FREETYPE_CFLAGS="-I${freetype_includedir}/" export FREETYPE_LIBS="-lfreetype -L${freetype_libdir}" CC="${CC} -static" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/freetype/freetype.mk b/freetype/freetype.mk @@ -13,7 +13,7 @@ freetype:QV: export LIBPNG_CFLAGS="-I${libpng_includedir}" export LIBPNG_LIBS="-L${libpng_libdir} -lpng16" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --disable-nls \ diff --git a/fuse/fuse.mk b/fuse/fuse.mk @@ -10,7 +10,7 @@ INSTALL_MAN8 = `{ ls -1 doc/*.8 } fuse:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-util \ diff --git a/git/git.mk b/git/git.mk @@ -6,11 +6,11 @@ DEPS = curl openssl zlib git:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - # NOTE: "$prefix/" is needed to set the proper mandir. + # NOTE: "$PREFIX/" is needed to set the proper mandir. make CURL_LIBCURL="${curl_libdir}/libcurl.a ${openssl_libdir}/libssl.a ${openssl_libdir}/libcrypto.a" \ CC="$CC -static" \ AR="$AR" \ - prefix="$prefix/" gitexecdir="$prefix"/lib/git-core \ + prefix="$PREFIX/" gitexecdir="$PREFIX"/lib/git-core \ NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -static" \ DESTDIR="$ROOT" -j$nprocs V=1 all @@ -18,11 +18,11 @@ git:QV: install: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - # NOTE: "$prefix/" is needed to set the proper mandir. + # NOTE: "$PREFIX/" is needed to set the proper mandir. make CURL_LIBCURL="${curl_libdir}/libcurl.a ${openssl_libdir}/libssl.a ${openssl_libdir}/libcrypto.a" \ CC="$CC -static" \ AR="$AR" \ - prefix="$prefix/" gitexecdir="$prefix"/lib/git-core \ + prefix="$PREFIX/" gitexecdir="$PREFIX"/lib/git-core \ NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -static" \ DESTDIR="$ROOT" -j$nprocs V=1 all install diff --git a/ii/ii.mk b/ii/ii.mk @@ -6,8 +6,8 @@ ii:QV: # overwrite default config.mk to allow overriding some variables. cp ../config.mk config.mk CC="${CC} -static" make -j$nprocs LDFLAGS="$LDFLAGS" \ - PREFIX="$prefix" DESTDIR="$ROOT" + PREFIX="$PREFIX" DESTDIR="$ROOT" install:QV: make -j$nprocs LDFLAGS="$LDFLAGS" \ - PREFIX="$prefix" DESTDIR="$ROOT" install + PREFIX="$PREFIX" DESTDIR="$ROOT" install diff --git a/libevent/libevent.mk b/libevent/libevent.mk @@ -3,7 +3,7 @@ TARG = libevent <$mkbuild/mk.common libevent:QV: - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" \ + CC="$CC" ./configure --prefix="$PREFIX" --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static make -j$nprocs diff --git a/libgiflib/libgiflib.mk b/libgiflib/libgiflib.mk @@ -4,7 +4,7 @@ TARG = libgiflib libgiflib:QV: CC="${CC} -static" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/libjpegturbo/libjpegturbo.mk b/libjpegturbo/libjpegturbo.mk @@ -4,7 +4,7 @@ TARG = libjpegturbo libjpegturbo:QV: CC="${CC} -static" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --without-simd \ diff --git a/libpng/libpng.mk b/libpng/libpng.mk @@ -8,7 +8,7 @@ libpng:QV: export CPPFLAGS="${CFLAGS}" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" CC="${CC} -static" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/libpthreadstubs/libpthreadstubs.mk b/libpthreadstubs/libpthreadstubs.mk @@ -4,7 +4,7 @@ TARG = libpthreadstubs libpthreadstubs:QV: CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --disable-shared \ --enable-static make -j$nprocs diff --git a/mupdf/mupdf.mk b/mupdf/mupdf.mk @@ -23,7 +23,7 @@ mupdf:QV: # TODO: change X11_LIBS etc. depending on DEPS, don't hardcode them. make -j$nprocs \ build="${build}" \ - prefix="$prefix" \ + prefix="$PREFIX" \ verbose="yes" \ CROSSCOMPILE="yes" \ HAVE_X11="yes" \ @@ -38,7 +38,7 @@ install:QV: make -j$nprocs install \ DESTDIR="$ROOT" \ build="${build}" \ - prefix="$prefix" \ + prefix="$PREFIX" \ verbose="yes" \ CROSSCOMPILE="yes" \ HAVE_X11="yes" \ diff --git a/ntfs3g/ntfs3g.mk b/ntfs3g/ntfs3g.mk @@ -28,7 +28,7 @@ INSTALL_SYMLINK = \ ntfs3g:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-really-static \ diff --git a/openssh/openssh.mk b/openssh/openssh.mk @@ -18,11 +18,11 @@ openssh:QV: CC="${CC} -static" \ ac_cv_path_AR="${AR}" \ CFLAGS="$issue104cflags -D_BSD_SOURCE -DMISSING_FD_MASK -DMISSING_NFDBITS $CFLAGS" \ - ./configure -C --prefix="$prefix" \ - --sbindir="$prefix"/bin --libexecdir="$prefix"/lib/ssh \ - --sysconfdir="$prefix"/etc/ssh \ + ./configure -C --prefix="$PREFIX" \ + --sbindir="$PREFIX"/bin --libexecdir="$PREFIX"/lib/ssh \ + --sysconfdir="$PREFIX"/etc/ssh \ --with-privsep-user=nobody \ - --with-md5-passwords --with-mantype=man --mandir="$prefix"/share/man \ + --with-md5-passwords --with-mantype=man --mandir="$PREFIX"/share/man \ --disable-strip --disable-lastlog --disable-utmp --disable-utmpx --disable-btmp \ --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline mkdir netinet diff --git a/openssl/openssl.mk b/openssl/openssl.mk @@ -43,8 +43,8 @@ openssl:QV: sslarch="arm" ;; esac - ./Configure "${sslarch}" --prefix="$prefix" --openssldir="$prefix"/etc/ssl \ - --libdir="$prefix"/lib no-dso no-asm zlib enable-md2 $CFLAGS + ./Configure "${sslarch}" --prefix="$PREFIX" --openssldir="$PREFIX"/etc/ssl \ + --libdir="$PREFIX"/lib no-dso no-asm zlib enable-md2 $CFLAGS # Clean out hardcoded flags that openssl uses CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ -e 's:^CFLAG=::' \ diff --git a/pkgtools/pkgtools.mk b/pkgtools/pkgtools.mk @@ -7,8 +7,8 @@ pkgtools:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" make -j$nprocs CC="${CC} -static" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - PREFIX="$prefix" DESTDIR="$ROOT" + PREFIX="$PREFIX" DESTDIR="$ROOT" install:QV: make -j$nprocs install CC="${CC} -static" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - PREFIX="$prefix" DESTDIR="$ROOT" + PREFIX="$PREFIX" DESTDIR="$ROOT" diff --git a/rsync/rsync.mk b/rsync/rsync.mk @@ -4,7 +4,7 @@ TARG = rsync rsync:QV: CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-locale make -j$nprocs diff --git a/st/st.mk b/st/st.mk @@ -13,9 +13,9 @@ st:QV: # overwrite default config.mk to allow overriding some variables. cp ../config.mk config.mk CC="${CC} -static" make -j$nprocs \ - PREFIX="$prefix" DESTDIR="$ROOT" + PREFIX="$PREFIX" DESTDIR="$ROOT" install:QV: # NOTE: set TERMINFO to force the proper path. - make -j$nprocs install PREFIX="$prefix" DESTDIR="$ROOT" \ + make -j$nprocs install PREFIX="$PREFIX" DESTDIR="$ROOT" \ TERMINFO="$ROOT/share/terminfo" diff --git a/testdisk/testdisk.mk b/testdisk/testdisk.mk @@ -7,7 +7,7 @@ testdisk:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-qt \ --without-iconv \ diff --git a/tinyxlib/tinyxlib.mk b/tinyxlib/tinyxlib.mk @@ -4,8 +4,8 @@ TARG = tinyxlib tinyxlib:QV: make clean - make -j$nprocs CC="$CC" BINDIR="/bin" LIBDIR="$prefix/lib" STATIC=1 \ - FONT_ENCODINGS_DIRECTORY="$prefix/share/fonts/encodings/encodings.dir" + make -j$nprocs CC="$CC" BINDIR="/bin" LIBDIR="$PREFIX/lib" STATIC=1 \ + FONT_ENCODINGS_DIRECTORY="$PREFIX/share/fonts/encodings/encodings.dir" # make symlinks for libs, just link to libX11.a like make install does. for f in \ libXdmcp.a \ diff --git a/tinyxserver/tinyxserver.mk b/tinyxserver/tinyxserver.mk @@ -17,10 +17,10 @@ tinyxserver:QV: cp ../Makefile Makefile make clean make -j$nprocs CC="$CC" EXTRA_CFLAGS="$EXTRA_CFLAGS" \ - FONTDIR="$prefix/share/fonts" + FONTDIR="$PREFIX/share/fonts" install:QV: make DESTDIR="$ROOT" BINDIR="/bin" install - cd "$ROOT/$prefix/share/fonts/misc" + cd "$ROOT/$PREFIX/share/fonts/misc" mkfontscale mkfontdir diff --git a/tmux/tmux.mk b/tmux/tmux.mk @@ -8,7 +8,7 @@ INSTALL_MAN1 = tmux.1 tmux:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" \ + CC="$CC" ./configure --prefix="$PREFIX" --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static make -j$nprocs diff --git a/xorgbigreqsproto/xorgbigreqsproto.mk b/xorgbigreqsproto/xorgbigreqsproto.mk @@ -4,7 +4,7 @@ TARG = xorgbigreqsproto xorgbigreqsproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgcompositeproto/xorgcompositeproto.mk b/xorgcompositeproto/xorgcompositeproto.mk @@ -4,7 +4,7 @@ TARG = xorgcompositeproto xorgcompositeproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgdamageproto/xorgdamageproto.mk b/xorgdamageproto/xorgdamageproto.mk @@ -4,7 +4,7 @@ TARG = xorgdamageproto xorgdamageproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgdmxproto/xorgdmxproto.mk b/xorgdmxproto/xorgdmxproto.mk @@ -4,7 +4,7 @@ TARG = xorgdmxproto xorgdmxproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgdri2proto/xorgdri2proto.mk b/xorgdri2proto/xorgdri2proto.mk @@ -4,7 +4,7 @@ TARG = xorgdri2proto xorgdri2proto:QV: CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorgfixesproto/xorgfixesproto.mk b/xorgfixesproto/xorgfixesproto.mk @@ -4,7 +4,7 @@ TARG = xorgfixesproto xorgfixesproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgfontsproto/xorgfontsproto.mk b/xorgfontsproto/xorgfontsproto.mk @@ -4,7 +4,7 @@ TARG = xorgfontsproto xorgfontsproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorginputproto/xorginputproto.mk b/xorginputproto/xorginputproto.mk @@ -3,7 +3,7 @@ TARG = xorgkbproto <$mkbuild/mk.common-noinst xorgkbproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgkbproto/xorgkbproto.mk b/xorgkbproto/xorgkbproto.mk @@ -3,7 +3,7 @@ TARG = xorgkbproto <$mkbuild/mk.common-noinst xorgkbproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorglibfontenc/xorglibfontenc.mk b/xorglibfontenc/xorglibfontenc.mk @@ -9,7 +9,7 @@ xorglibfontenc:QV: export FONTENC_CFLAGS=" " export FONTENC_LIBS=" " CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibpciaccess/xorglibpciaccess.mk b/xorglibpciaccess/xorglibpciaccess.mk @@ -10,7 +10,7 @@ xorglibpciaccess:QV: patch --silent --dry-run -N -p0 < ../limits.patch && \ patch -p0 < ../limits.patch CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --with-zlib \ --disable-shared \ diff --git a/xorglibpixman/xorglibpixman.mk b/xorglibpixman/xorglibpixman.mk @@ -12,7 +12,7 @@ xorglibpixman:QV: export PNG_CFLAGS="-I${libpng_includedir}" export PNG_LIBS="-L${libpng_libdir} -lpng16 -lm -lz" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static \ diff --git a/xorglibx11/xorglibx11.mk b/xorglibx11/xorglibx11.mk @@ -14,7 +14,7 @@ xorglibx11:QV: #TODO: more detailed flags # export X11_CFLAGS="-I${xorgxproto_includedir}" # export X11_LIBS="-L${xorgxproto_libdir}" - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --with-keysymdefdir="${xorgxproto_includedir}/X11" \ --disable-shared \ diff --git a/xorglibxau/xorglibxau.mk b/xorglibxau/xorglibxau.mk @@ -9,7 +9,7 @@ xorglibxau:QV: export XAU_CFLAGS="-I${xorgxproto_includedir}" export XAU_LIBS="-L${xorgxproto_libdir}" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs DESTDIR="`pwd`/lib/" install # remove .la files for now ? diff --git a/xorglibxcb/xorglibxcb.mk b/xorglibxcb/xorglibxcb.mk @@ -18,7 +18,7 @@ xorglibxcb:QV: # export NEEDED_CFLAGS="-I${xorgxproto_includedir}" # export NEEDED_LIBS="-L${xorgxproto_libdir}" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibxdmcp/xorglibxdmcp.mk b/xorglibxdmcp/xorglibxdmcp.mk @@ -12,7 +12,7 @@ xorglibxdmcp:QV: # set set it. # CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibxext/xorglibxext.mk b/xorglibxext/xorglibxext.mk @@ -11,7 +11,7 @@ xorglibxext:QV: # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibxfont/xorglibxfont.mk b/xorglibxfont/xorglibxfont.mk @@ -15,7 +15,7 @@ xorglibxfont:QV: export XFONT_CFLAGS=" " export XFONT_LIBS=" " CC="$CC" ./configure \ - --prefix="$prefix" --mandir="$ROOT/share/man" \ + --prefix="$PREFIX" --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorglibxft/xorglibxft.mk b/xorglibxft/xorglibxft.mk @@ -19,7 +19,7 @@ xorglibxft:QV: #export FONTCONFIG_CFLAGS="-I${fontconfig_includedir}" #export FONTCONFIG_LIBS="-lfontconfig -L${fontconfig_libdir}" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibxinerama/xorglibxinerama.mk b/xorglibxinerama/xorglibxinerama.mk @@ -11,7 +11,7 @@ xorglibxinerama:QV: # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorglibxkbfile/xorglibxkbfile.mk b/xorglibxkbfile/xorglibxkbfile.mk @@ -9,7 +9,7 @@ xorglibxkbfile:QV: export XKBFILE_CFLAGS="-I${xorgkbproto_includedir}" export XKBFILE_LIBS="-L${xorgkbproto_libdir}" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs DESTDIR="`pwd`/lib/" install # remove .la files for now ? diff --git a/xorglibxrender/xorglibxrender.mk b/xorglibxrender/xorglibxrender.mk @@ -12,7 +12,7 @@ xorglibxrender:QV: # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ - --prefix="$prefix" --mandir="$ROOT/share/man" \ + --prefix="$PREFIX" --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgrandrproto/xorgrandrproto.mk b/xorgrandrproto/xorgrandrproto.mk @@ -4,7 +4,7 @@ TARG = xorgrandrproto xorgrandrproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgrecordproto/xorgrecordproto.mk b/xorgrecordproto/xorgrecordproto.mk @@ -4,7 +4,7 @@ TARG = xorgrecordproto xorgrecordproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgrenderproto/xorgrenderproto.mk b/xorgrenderproto/xorgrenderproto.mk @@ -3,6 +3,6 @@ TARG = xorgrenderproto <$mkbuild/mk.common-noinst xorgrenderproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgresourceproto/xorgresourceproto.mk b/xorgresourceproto/xorgresourceproto.mk @@ -4,7 +4,7 @@ TARG = xorgresourceproto xorgresourceproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgscrnsaverproto/xorgscrnsaverproto.mk b/xorgscrnsaverproto/xorgscrnsaverproto.mk @@ -4,7 +4,7 @@ TARG = xorgscrnsaverproto xorgscrnsaverproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgserver/xorgserver.mk b/xorgserver/xorgserver.mk @@ -36,10 +36,10 @@ xorgserver:QV: export CC="$CC -static" # NOTE: xorgvideofbdev requires --enable-dga. ./configure \ - --prefix="$prefix" \ - --mandir="$ROOT/$prefix/share/man" \ + --prefix="$PREFIX" \ + --mandir="$ROOT/$PREFIX/share/man" \ --localstatedir=/var \ - --with-fontrootdir="$prefix/share/fonts/X11" \ + --with-fontrootdir="$PREFIX/share/fonts/X11" \ --with-xkb-output="/var/lib/xkb" \ --disable-dri \ --disable-dri2 \ diff --git a/xorgvideofbdev/xorgvideofbdev.mk b/xorgvideofbdev/xorgvideofbdev.mk @@ -11,7 +11,7 @@ xorgvideofbdev:QV: export XORG_CFLAGS="${CFLAGS}" export XORG_LIBS="${LDFLAGS}" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --disable-pciaccess \ diff --git a/xorgvideoproto/xorgvideoproto.mk b/xorgvideoproto/xorgvideoproto.mk @@ -4,7 +4,7 @@ TARG = xorgvideoproto xorgvideoproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgxcbproto/xorgxcbproto.mk b/xorgxcbproto/xorgxcbproto.mk @@ -6,6 +6,6 @@ TARG = xorgxcbproto xorgxcbproto:QV: export PYTHON="python2.7" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib/" diff --git a/xorgxcmiscproto/xorgxcmiscproto.mk b/xorgxcmiscproto/xorgxcmiscproto.mk @@ -4,7 +4,7 @@ TARG = xorgxcmiscproto xorgxcmiscproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgxextproto/xorgxextproto.mk b/xorgxextproto/xorgxextproto.mk @@ -3,6 +3,6 @@ TARG = xorgxextproto <$mkbuild/mk.common-noinst xorgxextproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxf86bigfontproto/xorgxf86bigfontproto.mk b/xorgxf86bigfontproto/xorgxf86bigfontproto.mk @@ -3,6 +3,6 @@ TARG = xorgxf86bigfontproto <$mkbuild/mk.common-noinst xorgxf86bigfontproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxf86dgaproto/xorgxf86dgaproto.mk b/xorgxf86dgaproto/xorgxf86dgaproto.mk @@ -4,7 +4,7 @@ TARG = xorgxf86dgaproto xorgxf86dgaproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgxineramaproto/xorgxineramaproto.mk b/xorgxineramaproto/xorgxineramaproto.mk @@ -3,6 +3,6 @@ TARG = xorgxextproto <$mkbuild/mk.common-noinst xorgxextproto:QV: - ./configure --prefix="$prefix" \ + ./configure --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxkbcomp/xorgxkbcomp.mk b/xorgxkbcomp/xorgxkbcomp.mk @@ -10,7 +10,7 @@ xorgxkbcomp:QV: export XKBCOMP_CFLAGS="${CFLAGS}" export XKBCOMP_LIBS="${LDFLAGS}" CC="$CC" ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/xorgxproto/xorgxproto.mk b/xorgxproto/xorgxproto.mk @@ -4,7 +4,7 @@ TARG = xorgxproto xorgxproto:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgxtrans/xorgxtrans.mk b/xorgxtrans/xorgxtrans.mk @@ -4,7 +4,7 @@ TARG = xorgxtrans xorgxtrans:QV: ./configure \ - --prefix="$prefix" \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib"