summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/gtk+/Makefile8
2 files changed, 5 insertions, 5 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 98ac0c41e..42f65b6d1 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
-PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify
+PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
PKG_DEPENDS+= libxdamage libxfixes libidl
PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 163aeed97..a9aa56c20 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/
-PKG_SUBPKGS:= GTK
+PKG_SUBPKGS:= LIBGTK
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
@@ -22,7 +22,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GTK,libgtk+,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= gio_can_sniff=no \
ac_cv_path_GTK_UPDATE_ICON_CACHE=""
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-libtiff \
--without-libjpeg
post-install:
- ${INSTALL_DIR} ${IDIR_GTK}/usr/lib
- ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_GTK}/usr/lib
+ ${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBGTK}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk