add an Id tag to the Makefile, set md5sum, don't use PKG_INSTALL_DIR since upstream does not provide a make install target

SVN-Revision: 2667
master
Nicolas Thill 19 years ago
parent 3f774a5f9d
commit 86d260bcd7
  1. 20
      openwrt/package/vnc-reflector/Makefile
  2. 20
      openwrt/package/vnc-reflector/patches/01-honor_include_lib_path.patch

@ -1,15 +1,17 @@
# $Id$
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vnc-reflector PKG_NAME:=vnc-reflector
PKG_VERSION:=1.2.4 PKG_VERSION:=1.2.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:= PKG_MD5SUM:=c3f88bc62f228b335c25c07f9744ab0c
PKG_SOURCE_URL:=@SF/vnc-reflector PKG_SOURCE_URL:=@SF/vnc-reflector
PKG_SOURCE:=vnc_reflector-$(PKG_VERSION).tar.gz PKG_SOURCE:=vnc_reflector-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/vnc_reflector
PKG_CAT:=zcat PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_BUILD_DIR:=$(BUILD_DIR)/vnc_reflector
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
@ -19,13 +21,15 @@ $(PKG_BUILD_DIR)/.configured:
touch $@ touch $@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.built:
$(MAKE) STAGING_DIR=$(STAGING_DIR) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \
install -d $(PKG_INSTALL_DIR)/usr/sbin CC=$(TARGET_CC) \
install -m0755 $(PKG_BUILD_DIR)/vncreflector $(PKG_INSTALL_DIR)/usr/sbin/ OFLAGS="$(TARGET_CFLAGS)" \
STAGING_DIR=$(STAGING_DIR) \
default
touch $@ touch $@
$(IPKG_VNC_REFLECTOR): $(IPKG_VNC_REFLECTOR):
mkdir -p $(IDIR_VNC_REFLECTOR) install -d -m0755 $(IDIR_VNC_REFLECTOR)/usr/sbin
cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VNC_REFLECTOR)/ install -m0755 $(PKG_BUILD_DIR)/vncreflector $(IDIR_VNC_REFLECTOR)/usr/sbin/
$(RSTRIP) $(IDIR_VNC_REFLECTOR) $(RSTRIP) $(IDIR_VNC_REFLECTOR)
$(IPKG_BUILD) $(IDIR_VNC_REFLECTOR) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_VNC_REFLECTOR) $(PACKAGE_DIR)

@ -1,21 +1,25 @@
diff -urN orig/vnc_reflector/Makefile vnc_reflector/Makefile --- vnc_reflector/Makefile.orig 2005-12-14 01:25:53.000000000 +0100
--- orig/vnc_reflector/Makefile 2003-04-16 19:32:42.000000000 +0200 +++ vnc_reflector/Makefile 2005-12-14 01:28:05.000000000 +0100
+++ vnc_reflector/Makefile 2005-12-13 11:08:09.000000000 +0100 @@ -14,10 +14,11 @@
@@ -14,7 +14,7 @@
# #
# Variables you might want to edit: CFLAGS, CONFFLAGS # Variables you might want to edit: CFLAGS, CONFFLAGS
-IFLAGS = -I. -IFLAGS = -I.
+IFLAGS = -I. -I$(STAGING_DIR)/usr/include +IFLAGS = -I. -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+OFLAGS = -O2
# Production # Production
CFLAGS = -O2 $(IFLAGS) -CFLAGS = -O2 $(IFLAGS)
@@ -29,7 +29,7 @@ +CFLAGS = $(OFLAGS) $(IFLAGS)
# Debug (strict)
#CFLAGS = -g -pedantic -Wall $(IFLAGS)
# Debug (profiling)
@@ -29,7 +30,7 @@
CONFFLAGS = -DUSE_POLL CONFFLAGS = -DUSE_POLL
# Link with zlib and JPEG libraries # Link with zlib and JPEG libraries
-LDFLAGS = -L/usr/local/lib -lz -ljpeg -LDFLAGS = -L/usr/local/lib -lz -ljpeg
+LDFLAGS = -L$(STAGING_DIR)/usr/lib -lz -ljpeg +LDFLAGS = -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lz -ljpeg
PROG = vncreflector PROG = vncreflector

Loading…
Cancel
Save