diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-11 23:56:49 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-12 08:49:31 +0100 |
| commit | 610e03b728df26bfbe978ba73841c1e891add91f (patch) | |
| tree | 713147ed0dea129bb8fe465cd5b01b5d9baca5c3 /rules/thttpd.make | |
| parent | 24b430952b300a9929cd035c44937a6b6f880412 (diff) | |
| download | ptxdist-610e03b728df26bfbe978ba73841c1e891add91f.tar.gz ptxdist-610e03b728df26bfbe978ba73841c1e891add91f.tar.xz | |
[thttpd] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/thttpd.make')
| -rw-r--r-- | rules/thttpd.make | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/rules/thttpd.make b/rules/thttpd.make index cab7fcbe0..331cf24bf 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id$ # # Copyright (C) 2003 by Benedikt Spranger +# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -37,30 +37,22 @@ $(THTTPD_SOURCE): # Prepare # ---------------------------------------------------------------------------- -THTTPD_PATH := PATH=$(CROSS_PATH) -THTTPD_ENV := $(CROSS_ENV) +THTTPD_PATH := PATH=$(CROSS_PATH) +THTTPD_ENV := $(CROSS_ENV) # # autoconf # -THTTPD_AUTOCONF := $(CROSS_AUTOCONF_USR) +THTTPD_AUTOCONF := $(CROSS_AUTOCONF_USR) -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/thttpd.compile: - @$(call targetinfo) - cd $(THTTPD_DIR) && $(THTTPD_PATH) $(MAKE) $(PARALLELMFLAGS_BROKEN) - @$(call touch) +THTTPD_MAKE_PAR := NO -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/thttpd.install: - @$(call targetinfo) - @$(call touch) +# DESTDIR is broken. Overwrite prefix instead +THTTPD_INSTALL_OPT := \ + DESTDIR= \ + prefix=$(THTTPD_PKGDIR)/usr \ + WEBGROUP=root \ + install # ---------------------------------------------------------------------------- # Target-Install @@ -74,12 +66,11 @@ $(STATEDIR)/thttpd.targetinstall: @$(call install_fixup, thttpd,PRIORITY,optional) @$(call install_fixup, thttpd,VERSION,$(THTTPD_VERSION)) @$(call install_fixup, thttpd,SECTION,base) - @$(call install_fixup, thttpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, thttpd,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, thttpd,DEPENDS,) @$(call install_fixup, thttpd,DESCRIPTION,missing) - @$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, \ - /usr/sbin/thttpd) + @$(call install_copy, thttpd, 0, 0, 0755, -, /usr/sbin/thttpd) ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_THTTPD_STARTSCRIPT @@ -95,8 +86,7 @@ ifdef PTXCONF_THTTPD__GENERIC_SITE endif ifdef PTXCONF_THTTPD__INSTALL_HTPASSWD - @$(call install_copy, thttpd, 0, 0, 0755, \ - $(THTTPD_DIR)/extras/htpasswd, \ + @$(call install_copy, thttpd, 0, 0, 0755, -, \ /usr/sbin/htpasswd) endif |