Commit 8ee721bc by heffnercj

Fixed OSX C library install bug.

parent 60d2b1d4
...@@ -2,6 +2,7 @@ export CC=@CC@ ...@@ -2,6 +2,7 @@ export CC=@CC@
export CFLAGS=@CFLAGS@ export CFLAGS=@CFLAGS@
export SONAME=@SONAME@ export SONAME=@SONAME@
export LIBDIR=@libdir@ export LIBDIR=@libdir@
export INSTALL_OPTIONS=@INSTALL_OPTIONS@
all: clean all: clean
make -C miniz make -C miniz
......
...@@ -9,7 +9,7 @@ compress42.o: ...@@ -9,7 +9,7 @@ compress42.o:
$(CC) $(CFLAGS) compress42.c -c $(CC) $(CFLAGS) compress42.c -c
install: install:
install -D -m644 $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
.PHONY: clean distclean .PHONY: clean distclean
......
...@@ -599,6 +599,7 @@ ac_includes_default="\ ...@@ -599,6 +599,7 @@ ac_includes_default="\
#endif" #endif"
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
INSTALL_OPTIONS
SONAME SONAME
LIBOBJS LIBOBJS
EGREP EGREP
...@@ -3277,12 +3278,16 @@ CFLAGS="-Wall -fPIC $CFLAGS" ...@@ -3277,12 +3278,16 @@ CFLAGS="-Wall -fPIC $CFLAGS"
if test "$(uname)" == "Darwin" if test "$(uname)" == "Darwin"
then then
SONAME="-install_name" SONAME="-install_name"
INSTALL_OPTIONS="-m644"
else else
SONAME="-soname" SONAME="-soname"
INSTALL_OPTIONS="-D -m644"
fi fi
SONAME=$SONAME SONAME=$SONAME
INSTALL_OPTIONS=$INSTALL_OPTIONS
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
......
...@@ -12,10 +12,13 @@ CFLAGS="-Wall -fPIC $CFLAGS" ...@@ -12,10 +12,13 @@ CFLAGS="-Wall -fPIC $CFLAGS"
if test "$(uname)" == "Darwin" if test "$(uname)" == "Darwin"
then then
SONAME="-install_name" SONAME="-install_name"
INSTALL_OPTIONS="-m644"
else else
SONAME="-soname" SONAME="-soname"
INSTALL_OPTIONS="-D -m644"
fi fi
AC_SUBST(SONAME, $SONAME) AC_SUBST(SONAME, $SONAME)
AC_SUBST(INSTALL_OPTIONS, $INSTALL_OPTIONS)
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
...@@ -9,7 +9,7 @@ tinfl.o: ...@@ -9,7 +9,7 @@ tinfl.o:
$(CC) $(CFLAGS) -c tinfl.c $(CC) $(CFLAGS) -c tinfl.c
install: install:
install -D -m644 $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
.PHONY: clean distclean .PHONY: clean distclean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment