From 84c90117669a5e574a5c80073a6a6ce0e7a6b21f Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 18 Nov 2003 17:56:52 +0000 Subject: [PATCH] Fix some more perl -> sed conversion problems --- make/netkitbase.mk | 4 ++-- make/netkittelnet.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make/netkitbase.mk b/make/netkitbase.mk index 248240ebe9..13d1fee584 100644 --- a/make/netkitbase.mk +++ b/make/netkitbase.mk @@ -18,7 +18,7 @@ netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE) $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE) $(NETKITBASE_CAT) $(DL_DIR)/$(NETKITBASE_SOURCE) | tar -C $(BUILD_DIR) -xvf - # use ANSI syntax - sed -i -e "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure + sed -i -e "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure # don't try to run cross compiled binaries while configuring things sed -i -e "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure touch $(NETKITBASE_DIR)/.unpacked @@ -39,7 +39,7 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) mkdir -p $(TARGET_DIR)/etc cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/ - sed -i -e "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf + sed -i -e "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk index 64af064070..b59f29fc91 100644 --- a/make/netkittelnet.mk +++ b/make/netkittelnet.mk @@ -19,9 +19,9 @@ netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE) $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE) $(NETKITTELNET_CAT) $(DL_DIR)/$(NETKITTELNET_SOURCE) | tar -C $(BUILD_DIR) -xvf - # use ANSI syntax - sed -i -e "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure + sed -i -e "s/main()/main(void)/;" $(NETKITTELNET_DIR)/configure # Disable termcap support - sed -i -e "s~(.*termcap\.h.*)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c + sed -i -e "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c # don't try to run cross compiled binaries while configuring things cat $(NETKITTELNET_PATCH) | patch -p1 -d $(NETKITTELNET_DIR) touch $(NETKITTELNET_DIR)/.unpacked @@ -47,7 +47,7 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_ #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -netkittelnet: uclibc $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) +netkittelnet: uclibc netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) netkittelnet-clean: #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) uninstall -- 2.30.2