From ee466424164d3d5c6ecbb655a9467a58c090c361 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Wed, 12 May 2021 21:56:12 +0900 Subject: [PATCH] improve for make pack --- Makefile.am | 10 +++++++--- pack/configure.ac_ | 15 --------------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pack/configure.ac_ diff --git a/Makefile.am b/Makefile.am index 62ab280..e6cbe4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,7 @@ pack: cd src;make ros rm -rf $(PACK)/lisp $(PACKPATH)/man $(PACKPATH)/patch $(MKDIR_P) $(PACK)/bin - cp src/ros $(PACK)/bin + cp src/ros$(EXEEXT) $(PACK)/bin $(MKDIR_P) $(PACK)/lisp cp $(LISPS:%=lisp/%) $(PACK)/lisp $(MKDIR_P) $(PACK)/patch @@ -137,13 +137,17 @@ pack: $(MKDIR_P) $(PACK)/man cp $(MDS:%.md=documents/man/%.1) $(PACK)/man echo "prefix = /usr/local" > $(PACK)/Makefile - echo "all: bin/ros" >> $(PACK)/Makefile + echo "all: bin/ros$(EXEEXT)" >> $(PACK)/Makefile echo "install:" >> $(PACK)/Makefile echo " mkdir -p $$""(prefix)/bin" >> $(PACK)/Makefile echo " mkdir -p $$""(prefix)/etc/roswell/patch" >> $(PACK)/Makefile - echo " install -c bin/ros $$""(prefix)/bin" >> $(PACK)/Makefile + echo " install -c bin/ros$(EXEEXT) $$""(prefix)/bin" >> $(PACK)/Makefile echo " install -c -m 644 $(LISPS:%=lisp/%) $$""(prefix)/etc/roswell" >> $(PACK)/Makefile echo " install -c -m 644 $(roslisppatch_DATA) $$""(prefix)/etc/roswell/patch" >> $(PACK)/Makefile + echo "" >> $(PACK)/Makefile + echo "uninstall:" >> $(PACK)/Makefile + echo " rm -rf $$""(prefix)/etc/roswell" >> $(PACK)/Makefile + echo " rm -f $$""(prefix)/bin/ros$(EXEEXT)" >> $(PACK)/Makefile tar jcvf $(PACK).tar.bz2 $(PACK) FORCE: diff --git a/pack/configure.ac_ b/pack/configure.ac_ deleted file mode 100644 index ca1c4cc..0000000 --- a/pack/configure.ac_ +++ /dev/null @@ -1,15 +0,0 @@ -AC_PREREQ([2.59]) -AC_INIT() - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([foreign]) -AM_MAINTAINER_MODE([disable]) - -roslispdir='${prefix}/etc/roswell' -AC_SUBST(roslispdir) -roslisppatchdir='${roslispdir}/patch' -AC_SUBST(roslisppatchdir) - -AC_OUTPUT