diff --git a/make.sh b/make.sh index 8a848c0..3e0d0a5 100755 --- a/make.sh +++ b/make.sh @@ -35,8 +35,8 @@ if [ "$uname" = "Linux" ]; then elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then CFLAGS="$CFLAGS" if [ "$uname" = "Darwin" ]; then - LIB_VERSION=lib TARGET_PREFIX=$TARGET_PREFIX/local + LIB_VERSION=lib fi elif [ "$uname" = "SunOS" ]; then @@ -111,11 +111,14 @@ sed_replace() cd src cp Makefile.in Makefile -sed_replace "s#\$(CFLAGS)#$CFLAGS#g" Makefile -sed_replace "s#\$(LIBS)#$LIBS#g" Makefile -sed_replace "s#\$(TARGET_PREFIX)#$TARGET_PREFIX#g" Makefile -sed_replace "s#\$(ENABLE_STATIC_LIB)#$ENABLE_STATIC_LIB#g" Makefile -sed_replace "s#\$(ENABLE_SHARED_LIB)#$ENABLE_SHARED_LIB#g" Makefile +sed_replace "s#\\\$(CFLAGS)#$CFLAGS#g" Makefile +sed_replace "s#\\\$(LIBS)#$LIBS#g" Makefile +sed_replace "s#\\\$(TARGET_PREFIX)#$TARGET_PREFIX#g" Makefile +sed_replace "s#\\\$(ENABLE_STATIC_LIB)#$ENABLE_STATIC_LIB#g" Makefile +sed_replace "s#\\\$(ENABLE_SHARED_LIB)#$ENABLE_SHARED_LIB#g" Makefile sed_replace "s#\\\$(LIB_VERSION)#$LIB_VERSION#g" Makefile -make $1 $2 +make $1 $2 $3 +if [ "$1" = "clean" ]; then + /bin/rm -f Makefile +fi diff --git a/src/Makefile.in b/src/Makefile.in index 6db6ee7..602bfbd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -21,9 +21,10 @@ libserverframe.so: sf_nio.lo sf_service.lo sf_global.lo sf_func.lo sf_util.lo $(COMPILE) -c -o $@ $< $(INC_PATH) install: mkdir -p $(TARGET_LIB) + mkdir -p $(TARGET_PREFIX)/lib mkdir -p $(TARGET_PREFIX)/include/sf - cp -f $(ALL_LIBS) $(TARGET_LIB) + install -m 755 $(ALL_LIBS) $(TARGET_LIB) cp -f $(ALL_HEADERS) $(TARGET_PREFIX)/include/sf if [ ! -e $(TARGET_PREFIX)/lib/libserverframe.so ]; then ln -s $(TARGET_LIB)/libserverframe.so $(TARGET_PREFIX)/lib/libserverframe.so; fi