diff -Nurd -x'*~' gsm-1.0-pl10.orig/Makefile gsm-1.0-pl10/Makefile --- gsm-1.0-pl10.orig/Makefile 1996-07-02 10:36:06.000000000 -0400 +++ gsm-1.0-pl10/Makefile 2006-07-19 03:50:44.000000000 -0400 @@ -22,8 +22,8 @@ ######### both integer and floating point multiplications. ######### This flag is still in the experimental stage. -#WAV49 = -DWAV49 -WAV49 = +WAV49 = -DWAV49 +#WAV49 = ######### Define to enable the GSM library's option to pack GSM frames ######### in the style used by the WAV #49 format. If you want to write ######### a tool that produces .WAV files which contain GSM-encoded data, @@ -43,7 +43,7 @@ # CC = /usr/lang/acc # CCFLAGS = -c -O -CC = gcc -ansi -pedantic +CC = cc -ansi -pedantic CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 LD = $(CC) @@ -80,8 +80,8 @@ GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib -GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc -GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 +GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include +GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3 # Where do you want to install the toast binaries and their manpage? @@ -91,7 +91,7 @@ TOAST_INSTALL_ROOT = $(INSTALL_ROOT) TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin -TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1 +TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1 # Other tools @@ -100,7 +100,7 @@ BASENAME = basename AR = ar ARFLAGS = cr -RMFLAGS = +RMFLAGS = -f FIND = find COMPRESS = compress COMPRESSFLAGS = @@ -332,12 +332,17 @@ gsminstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ - make $(GSM_INSTALL_TARGETS) ; \ + if [ ! -d $(GSM_INSTALL_INC) ] ; then mkdir -p $(GSM_INSTALL_INC) ; fi; \ + if [ ! -d $(GSM_INSTALL_LIB) ] ; then mkdir -p $(GSM_INSTALL_LIB) ; fi; \ + if [ ! -d $(GSM_INSTALL_MAN) ] ; then mkdir -p $(GSM_INSTALL_MAN) ; fi; \ + make $(GSM_INSTALL_TARGETS) INSTALL_ROOT=$(INSTALL_ROOT); \ fi toastinstall: -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \ - make $(TOAST_INSTALL_TARGETS); \ + if [ ! -d $(TOAST_INSTALL_BIN) ] ; then mkdir -p $(TOAST_INSTALL_BIN) ; fi; \ + if [ ! -d $(TOAST_INSTALL_MAN) ] ; then mkdir -p $(TOAST_INSTALL_MAN) ; fi; \ + make $(TOAST_INSTALL_TARGETS) INSTALL_ROOT=$(INSTALL_ROOT); \ fi gsmuninstall: @@ -351,50 +356,50 @@ fi $(TOAST_INSTALL_BIN)/toast: $(TOAST) - -rm $@ + -rm $(RMFLAGS) $@ cp $(TOAST) $@ chmod 755 $@ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast - -rm $@ + -rm $(RMFLAGS) $@ ln $? $@ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast - -rm $@ + -rm $(RMFLAGS) $@ ln $? $@ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) - -rm $@ + -rm $(RMFLAGS) $@ cp $? $@ chmod 444 $@