Commit 84c90117 authored by Eric Andersen's avatar Eric Andersen
Browse files

Fix some more perl -> sed conversion problems

parent 6b4ce4ee

make/netkitbase.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

make/netkittelnet.mk

+3 −3
Original line number Diff line number Diff line
@@ -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