diff options
| author | waszi | 2000-08-23 21:38:27 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 01204daa98e6d85bea6e31cb0d1b2336acb6f9fd (patch) | |
| tree | 1c3610f0a307679424ca7af977d49fa25ba792fc | |
| parent | dec79a1e37279edab0acaeeac53886978cf2ff1c (diff) | |
| download | libgsm-01204daa98e6d85bea6e31cb0d1b2336acb6f9fd.zip libgsm-01204daa98e6d85bea6e31cb0d1b2336acb6f9fd.tar.gz | |
97c35942818b3ed39051c9a5a45f3598 libgsm-makefile.patch
Changed files:
libgsm-makefile.patch -> 1.1
| -rw-r--r-- | libgsm-makefile.patch | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/libgsm-makefile.patch b/libgsm-makefile.patch new file mode 100644 index 0000000..d643cd2 --- /dev/null +++ b/libgsm-makefile.patch @@ -0,0 +1,129 @@ +diff -ruN gsm-1.0-pl10.orig/Makefile gsm-1.0-pl10/Makefile +--- gsm-1.0-pl10.orig/Makefile Tue Jul 2 16:36:06 1996 ++++ gsm-1.0-pl10/Makefile Wed Aug 23 23:34:32 2000 +@@ -44,7 +44,7 @@ + # CCFLAGS = -c -O + + CC = gcc -ansi -pedantic +-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 ++CCFLAGS = $(OPTFLAGS) -c -DNeedFunctionPrototypes=1 + + LD = $(CC) + +@@ -78,10 +78,10 @@ + # Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of + # this directory. + +-GSM_INSTALL_ROOT = $(INSTALL_ROOT) ++GSM_INSTALL_ROOT = /usr + 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? +@@ -89,9 +89,9 @@ + # Leave TOAST_INSTALL_ROOT empty to not install the toast binaries outside + # of this directory. + +-TOAST_INSTALL_ROOT = $(INSTALL_ROOT) ++TOAST_INSTALL_ROOT = /usr + 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 + +@@ -300,7 +300,6 @@ + # The basic API: libgsm + + $(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) + $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + +@@ -311,11 +310,9 @@ + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(UNTOAST) + $(LN) $(TOAST) $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(TCAT) + $(LN) $(TOAST) $(TCAT) + + +@@ -351,52 +348,42 @@ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ +- cp $(TOAST) $@ +- chmod 755 $@ ++ cp $(TOAST) $(INSTALL_ROOT)$@ ++ chmod 755 $(INSTALL_ROOT)$@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ ln -sf $? $(INSTALL_ROOT)$@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ ln -sf $? $(INSTALL_ROOT)$@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ +- cp $? $@ +- chmod 444 $@ ++ cp $? $(INSTALL_ROOT)$@ ++ chmod 444 $(INSTALL_ROOT)$@ + + + # Distribution |