summaryrefslogtreecommitdiff
path: root/package/xinit/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-17 23:19:48 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-17 23:19:55 -0600
commit3798b63c5f2b0baea3b24be48ede03bfbef7d81b (patch)
treedd137f0638f6ccbf53af170253a6c0aafd6d014b /package/xinit/Makefile
parent268ddf223cd7303ddfd8b8ef07c2ce7406e3bc39 (diff)
add first preview of a firefox appliance. java plugin and kiosk addon missing.
Diffstat (limited to 'package/xinit/Makefile')
-rw-r--r--package/xinit/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 0c80a6379..a352a9495 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xinit
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_HASH:= 3079d3fb86af99f4c2c2907b5725e5820fdb2144d3be6002ec367bfcebc5c480
PKG_DESCR:= x window system initializer
PKG_SECTION:= x11/utils
@@ -14,13 +14,11 @@ PKG_BUILDDEP:= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_ARCH_DEPENDS:= !m68k
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
TARGET_CPPFLAGS+= -D_POSIX_SOURCE
CONFIGURE_ARGS:= --without-launchd
@@ -28,10 +26,12 @@ XAKE_FLAGS+= RAWCPP="$(TARGET_CROSS)cpp"
xinit-install:
$(INSTALL_DIR) $(IDIR_XINIT)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/{xinit,startx} \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/startx \
+ $(IDIR_XINIT)/usr/bin/
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/xinit \
$(IDIR_XINIT)/usr/bin/
- ${INSTALL_DIR} ${IDIR_XINIT}/usr/lib/X11/xinit
- ${INSTALL_DATA} ${WRKINST}/usr/lib/X11/xinit/xinitrc \
- ${IDIR_XINIT}/usr/lib/X11/xinit/
+ $(INSTALL_DIR) $(IDIR_XINIT)/usr/lib/X11/xinit
+ $(INSTALL_DATA) $(WRKINST)/usr/lib/X11/xinit/xinitrc \
+ $(IDIR_XINIT)/usr/lib/X11/xinit/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk