aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-20 08:47:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-20 08:47:19 +0000
commit24aa50171469ccb468706460cf1c5d2256ff7a20 (patch)
treee8d0c4a2610601db4b43b09f97adf657a2fc67c2
parente452e8b07e2d6b711646bf4881fe4374fe6518df (diff)
downloadmaster-187ad058-24aa50171469ccb468706460cf1c5d2256ff7a20.tar.gz
master-187ad058-24aa50171469ccb468706460cf1c5d2256ff7a20.tar.bz2
master-187ad058-24aa50171469ccb468706460cf1c5d2256ff7a20.zip
comgt: clean up patch, rename gcom binary to comgt, but add a compatibility symlink
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27699 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/comgt/Makefile8
-rw-r--r--package/comgt/patches/001-Makefile.patch88
-rw-r--r--package/comgt/patches/001-compile_fix.patch23
3 files changed, 28 insertions, 91 deletions
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 00c1118113..61c123a737 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -37,12 +37,14 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- gcom
+ LDFLAGS="" \
+ comgt
endef
-
+
define Package/comgt/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/gcom $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/comgt $(1)/usr/bin/
+ ln -s comgt $(1)/usr/bin/gcom
$(INSTALL_DIR) $(1)/etc/ppp
$(INSTALL_BIN) ./files/3g.connect $(1)/etc/ppp/3g.connect
$(INSTALL_DIR) $(1)/etc/chatscripts
diff --git a/package/comgt/patches/001-Makefile.patch b/package/comgt/patches/001-Makefile.patch
deleted file mode 100644
index ed3e9183d1..0000000000
--- a/package/comgt/patches/001-Makefile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,6 @@
- #
--# Makefile - build and install the comgt package
-+# Makefile - build and install the gmon package
- # Copyright (C) 2005 Martin Gregorie
--# Copyright (C) 2006 Paul Hardwick
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -17,63 +16,41 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- #
--# martin@gregorie.org, paul@peck.org.uk
-+# martin@gregorie.org
- #
--# $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
-+# $Id$
- #
--#
--
--LIB = -L/usr/local/lib
--INC = -I/usr/local/include
- EXE = /usr/local/bin
- MAN = /usr/share/man/man1
--CPROG = comgt
--SCRIPTPATH = /etc/comgt/
--SCRIPTSRC = ./scripts/
--BIN = $(CPROG)
--MANP = comgt.1 sigmon.1
--
--CFLAGS = -c
--LDFLAGS =
-+CPROG = gcom
-+SCRIPT = sigmon
-+BIN = $(CPROG) $(SCRIPT)
-+MANP = gcom.1 sigmon.1
-
- all: $(BIN)
-
- install:
-+ mv ($BIN} {$BIN2}
- chmod a-w $(BIN)
- chmod u+rw $(BIN)
- chmod a+x $(BIN)
-- cp $(BIN) $(EXE)
-+ cp $(BIN) $(EXE)/gcom
- chmod a-wx $(MANP)
- chmod u+rw $(MANP)
- chmod a+r $(MANP)
- cp $(MANP) $(MAN)
-- -mkdir $(SCRIPTPATH)
-- chmod a-w $(SCRIPTPATH)
-- chmod u+rw $(SCRIPTPATH)
-- chmod a+x $(SCRIPTPATH)
-- cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
-- chmod a-w $(SCRIPTPATH)*
-- chmod u+rw $(SCRIPTPATH)*
-- chmod a+x $(SCRIPTPATH)*
--
--
--
-
- uninstall:
- cd $(EXE); rm $(BIN)
- cd $(MAN); rm $(MANP)
-- -rm -r $(SCRIPTPATH)
-
- clean:
-- -rm *.o
-- -rm $(CPROG)
-- -rm *~
-- -rm $(SCRIPTSRC)*~
-+ rm *.o $(CPROG)
-
-
--comgt: comgt.o
-- cc comgt.o $(LDFLAGS) -o comgt
-+gcom: gcom.o
-+ $(CC) gcom.o $(LDFLAGS) -o gcom
-
--comgt.o: comgt.c comgt.h
-- cc comgt.c $(CFLAGS)
-+gcom.o: comgt.c comgt.h
-+ $(CC) -c $(CFLAGS) comgt.c -o gcom.o
-
diff --git a/package/comgt/patches/001-compile_fix.patch b/package/comgt/patches/001-compile_fix.patch
new file mode 100644
index 0000000000..15de850b73
--- /dev/null
+++ b/package/comgt/patches/001-compile_fix.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,6 +32,7 @@ SCRIPTPATH = /etc/comgt/
+ SCRIPTSRC = ./scripts/
+ BIN = $(CPROG)
+ MANP = comgt.1 sigmon.1
++CC = cc
+
+ CFLAGS = -c
+ LDFLAGS =
+@@ -70,10 +71,5 @@ clean:
+ -rm *~
+ -rm $(SCRIPTSRC)*~
+
+-
+-comgt: comgt.o
+- cc comgt.o $(LDFLAGS) -o comgt
+-
+-comgt.o: comgt.c comgt.h
+- cc comgt.c $(CFLAGS)
+-
++comgt: comgt.c comgt.h
++ $(CC) $(CFLAGS) -o comgt $< $(LDFLAGS)