janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

pkg.sh and defs.mk: Add pkg.sh install-log -N, fix links

Browse source 
pkg.sh install-log now supports a -N option, meaning no-log-directories. This
installs directories, but doesn't log then in the install log, effectively
excluding them from being packaged. This is necessary for directories provided
by other packages. -N can be activated by adding LOG_INSTALL_EXTRA_OPTS += -N
to a Makefile, see changes in defs.mk.

pgk.sh install-log now also omits addition of %attr tags to symbolic links.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-10-18 12:02:23 +00:00
commit e37e7f91c1
2 changed files with 50 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/defs.mk
View file

@ -200,6 +200,10 @@ else
endif
endif
USE_COMPILER_OPTIMIZATION_OPTS = false
USE_COMPILER_DEBUG_OPTS = true
COMPILE_DEBUG_CODE = true
BUILD_CFLAGS += $(CFLAGS)
BUILD_CPPFLAGS += $(CPPFLAGS)
BUILD_LDFLAGS += $(LDFLAGS)
@ -497,7 +501,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
# -- HTML
INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js *.cgi) $(FONTS) $(IMAGES))
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES))
HTML_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)
@ -707,25 +711,27 @@ ifeq ($(LOG_THREAD_NAMES), true)
endif
ifdef INSTALL_LINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else ifdef INSTALL_SYMLINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else
ifdef INSTALL_LOG
INSTALL=$(LOG_INSTALL_SH) -p -l $(INSTALL_LOG)
LINK_LIB=$(LOG_INSTALL_SH) -L -l $(INSTALL_LOG)
INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
else
ifndef INSTALL
INSTALL = install
endif
ifndef LINK_LIB
LINK_LIB=$(LOG_INSTALL_SH) -L
LINK_LIB = $(LOG_INSTALL_SH) -L
endif
endif
endif
INSTALL_FILE ?= $(INSTALL)
INSTALL_DIR ?= $(INSTALL)
# ----- function definitions