Waldemar Brodkorb 9 jaren geleden
bovenliggende
commit
fd280c6155
3 gewijzigde bestanden met toevoegingen van 12 en 12 verwijderingen
  1. 4 4
      package/.template/Makefile
  2. 5 5
      package/.templatelib/Makefile
  3. 3 3
      package/.templateprog/Makefile

+ 4 - 4
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

+ 5 - 5
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

+ 3 - 3
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