From fd280c6155b1c3ab5ac3af18e2a2df3673e092da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 3 Feb 2015 06:20:19 +0100 Subject: fixup --- package/.template/Makefile | 8 ++++---- package/.templatelib/Makefile | 10 +++++----- package/.templateprog/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/.template/Makefile b/package/.template/Makefile index 2536da873..f60be74bb 100644 --- a/package/.template/Makefile +++ b/package/.template/Makefile @@ -15,7 +15,7 @@ PKG_BUILDDEP:= add packages which need to be compiled PKG_URL:= add project url PKG_SITES:= add download url without package name # alternatively use a pre-defined set of mirrors, see mk/mirrors.mk: -#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sub/path/} +#PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=sub/path/) # if more than one binary package is created, add symbol names of all here # leave variable empty, when no binary package is created. You can set it @@ -53,11 +53,11 @@ PKG_SITES:= add download url without package name #PKGCS_WITH_GNUTLS:= libgnutls # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) #CONFIG_STYLE:= manual # use following to add ./configure options @@ -74,4 +74,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE $(IDIR_@UPKG@)/usr/bin # please remove ALL above comments, before commiting -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/.templatelib/Makefile b/package/.templatelib/Makefile index e89b61bfa..0ba543c83 100644 --- a/package/.templatelib/Makefile +++ b/package/.templatelib/Makefile @@ -8,21 +8,21 @@ PKG_VERSION:= @VER@ PKG_RELEASE:= 1 PKG_HASH:= add sha256 checksum of package here PKG_DESCR:= add short description -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_URL:= add project url PKG_SITES:= add download url without package name PKG_OPTS:= dev # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) @PKG@-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib - $(CP) $(WRKINST)/usr/lib/@PKG@*.so* \ + $(CP) $(WRKINST)/usr/lib/lib@PKG@*.so* \ $(IDIR_@UPKG@)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/.templateprog/Makefile b/package/.templateprog/Makefile index cb58e77a9..919e85807 100644 --- a/package/.templateprog/Makefile +++ b/package/.templateprog/Makefile @@ -15,15 +15,15 @@ PKG_URL:= add project url PKG_SITES:= add download url without package name # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) @PKG@-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \ $(IDIR_@UPKG@)/usr/bin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3