Permalink
Browse files

fix yaws issue #105: configure ignores --libdir

  • Loading branch information...
1 parent 6b52665 commit c0082785ff0b0f056a19b5f90dcfd929500df2d3 @vinoski vinoski committed May 5, 2012
Showing with 22 additions and 20 deletions.
  1. +3 −3 Makefile
  2. +4 −4 applications/yapp/Makefile
  3. +5 −5 c_src/Makefile
  4. +2 −0 include.mk.in
  5. +1 −1 scripts/Makefile
  6. +7 −7 src/Makefile
View
@@ -28,13 +28,13 @@ install: all
then ( cd $$d && $(MAKE) $@ ) || exit 1 ; \
fi ; \
done
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
- $(INSTALL) -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(PREFIX)/lib/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pkgconfig
+ $(INSTALL) -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(LIBDIR)/pkgconfig
@echo "-------------------------------"
@echo
@echo "** etc files went into ${ETCDIR}"
@echo "** executables went into ${prefix}/bin"
- @echo "** library files went into ${prefix}/lib/yaws"
+ @echo "** library files went into ${LIBDIR}/yaws"
@echo "** var files went into ${VARDIR}"
@echo "** default docroot went into ${VARDIR}/yaws/www"
@echo
@@ -24,8 +24,8 @@ cleandocs:
rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
install: all docs
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/ebin
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/priv/docroot
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/doc
- (tar cf - ebin priv doc) | (cd $(DESTDIR)$(PREFIX)/lib/yapp; tar xf - )
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/$(APPNAME)/ebin
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/$(APPNAME)/priv/docroot
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/$(APPNAME)/doc
+ (tar cf - ebin priv doc) | (cd $(DESTDIR)$(LIBDIR)/yapp; tar xf - )
View
@@ -34,12 +34,12 @@ clean:
-rm -f $(PRIV_FILES) setuid_drv.$(OBJ) epam.$(OBJ) yaws_sendfile_drv.$(OBJ) hashtable.$(OBJ)
install: $(PRIV_FILES)
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib
- $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/priv/lib
+ $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(LIBDIR)/yaws/priv/lib
ifndef WIN32
- if [ `id -u` = "0" -a -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam ]; then \
- chown root $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam; \
- chmod a+s $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam; \
+ if [ `id -u` = "0" -a -d $(DESTDIR)$(LIBDIR)/yaws/priv/epam ]; then \
+ chown root $(DESTDIR)$(LIBDIR)/yaws/priv/epam; \
+ chmod a+s $(DESTDIR)$(LIBDIR)/yaws/priv/epam; \
fi
endif
View
@@ -3,8 +3,10 @@
PREFIX = @prefix@
prefix = ${PREFIX}
+exec_prefix = @exec_prefix@
ETCDIR = @sysconfdir@
VARDIR = @localstatedir@
+LIBDIR = @libdir@
DVILATEX = @DVILATEX@
PDFLATEX = @PDFLATEX@
View
@@ -13,7 +13,7 @@ local_install: ../bin/yaws
VARDIR="${HOME}/var" ./local-install true
yaws.conf:
- YAWSDIR='$(PREFIX)/lib/yaws' LOGDIR='$(PREFIX)/var/log/yaws' \
+ YAWSDIR='$(LIBDIR)/yaws' LOGDIR='$(PREFIX)/var/log/yaws' \
VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/yaws/www' \
CERTDIR='$(ETCDIR)/yaws' SSLPORT=443 ./gen-yaws-conf > $@
View
@@ -112,15 +112,15 @@ clean:
mime_types.erl yaws_configure.hrl mime_type_c.beam
install: regen all docsinstall
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/examples/ebin
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/examples/include
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/ebin
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/examples/ebin
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/examples/include
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/ebin
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/priv
$(INSTALL) -d $(DESTDIR)$(VARDIR)/log/yaws
$(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/ebin
- (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - )
- (cd ..; tar cf - include ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - )
- (cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - )
+ (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ (cd ..; tar cf - include ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ (cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
docsinstall:
$(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/www

0 comments on commit c008278

Please sign in to comment.