diff --git a/PKGBUILD b/PKGBUILD index b64c818..8f172d2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -28,4 +28,5 @@ package() { cd "$pkgname-$pkgver" make PREFIX=/usr DESTDIR="$pkgdir" CC=gcc install install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + touch "$pkgdir"/usr/share/spmenu/pkg_arch } diff --git a/build.sh b/build.sh index 6e2f946..7f1e579 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,7 @@ loadconf() { # mandatory deps [ "$freetype" = "false" ] && printf "Freetype not found. Install it.\n" && exit 1 - [ "$openssl" = "false" ] && printf "OpenSSL not found. Install it.\n" && exit 1 + [ "$openssl" = "false" ] && [ "$imlib2" = "true" ] && printf "OpenSSL not found. Install it.\n" && exit 1 [ "$xrender" = "false" ] && printf "libXrender not found. Install it.\n" && exit 1 [ "$x11" = "false" ] && printf "libX11 not found. Install it.\n" && exit 1 [ "$xft" = "false" ] && printf "libXft not found. Install it.\n" && exit 1 @@ -69,6 +69,11 @@ build() { imlib2toggle="-DIMAGE" fi + # openssl + if [ "$openssl" = "true" ]; then + opensslconf="openssl" + fi + # pango if [ "$pango" = "true" ] && [ "$pangoxft" = "true" ]; then pangoconf="pango" @@ -89,6 +94,8 @@ build() { make clean [ "$GEN_MANUAL" != "false" ] && make man + + [ "$INSTALL" != "true" ] && \ make \ CC="$CC" \ PREFIX="$PREFIX" \ @@ -104,6 +111,7 @@ build() { BDINC="$bdinc" \ BDTOGGLE="$bdtoggle" \ FREETYPEINC="$FREETYPEINC" \ + OPENSSLCONF="$opensslconf" \ X11LIB="$X11LIB" \ X11INC="$X11INC" } @@ -125,6 +133,7 @@ install() { BDINC="$bdinc" \ BDTOGGLE="$bdtoggle" \ FREETYPEINC="$FREETYPEINC" \ + OPENSSLCONF="$opensslconf" \ X11LIB="$X11LIB" \ X11INC="$X11INC" } diff --git a/host.mk b/host.mk index 2ba3f41..5176536 100644 --- a/host.mk +++ b/host.mk @@ -29,12 +29,6 @@ XFTCONF = xft # xrender XRENDERLIBS = -lXrender -# imlib2 -IMLIB2LIBS = -lImlib2 - -# openssl -OPENSSLCONF = openssl - # OpenBSD (uncomment) #INCDIR = $(X11INC) #FREETYPEINC = $(INCDIR)/freetype2 diff --git a/spmenu.c b/spmenu.c index 9fbf3a1..b690d4f 100644 --- a/spmenu.c +++ b/spmenu.c @@ -44,10 +44,10 @@ #endif // check if we should enable multimonitor support using libXinerama -#ifdef XINERAMA -#define USEXINERAMA 1 -#else +#ifndef XINERAMA #define USEXINERAMA 0 +#else +#define USEXINERAMA 1 #endif // include fribidi used for right to left language support diff --git a/toggle.mk b/toggle.mk index e8ffb49..ef9df52 100644 --- a/toggle.mk +++ b/toggle.mk @@ -23,3 +23,4 @@ PANGOTOGGLE = -DPANGO # Comment these lines if you don't need it. IMLIB2LIBS = -lImlib2 IMLIB2TOGGLE = -DIMAGE +OPENSSLCONF = openssl