View | Details | Raw Unified | Return to bug 157160
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 29-35 Link Here
29
LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
29
LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
30
30
31
SUB_FILES=	pkg-install pkg-deinstall
31
SUB_FILES=	pkg-install pkg-deinstall
32
SUB_LIST=	CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
32
SUB_LIST=	LOCAL_CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
33
33
34
post-patch:
34
post-patch:
35
	@${REINPLACE_CMD} -e \
35
	@${REINPLACE_CMD} -e \
(-)files/pkg-deinstall.in (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
[ "$2" != "DEINSTALL" ] && exit 0
3
[ "$2" != "DEINSTALL" ] && exit 0
4
4
5
for f in %%CONF_FILES%%; do
5
for f in %%LOCAL_CONF_FILES%%; do
6
    if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then
6
    if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then
7
	rm -f "%%CONF_DIR%%/$f"
7
	rm -f "%%CONF_DIR%%/$f"
8
    fi
8
    fi
(-)files/pkg-install.in (-1 / +1 lines)
Lines 2-7 Link Here
2
2
3
[ "$2" != "POST-INSTALL" ] && exit 0
3
[ "$2" != "POST-INSTALL" ] && exit 0
4
4
5
for f in %%CONF_FILES%%; do
5
for f in %%LOCAL_CONF_FILES%%; do
6
    [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f"
6
    [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f"
7
done
7
done

Return to bug 157160