~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable hardening flags harder.
[disorder]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
aecacc4
..
d539af7
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-20,17
+20,15
@@
cgiexecdir=/usr/lib/cgi-bin
httpdir=/var/www
browser=x-www-browser
httpdir=/var/www
browser=x-www-browser
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+
# Options to configure. This can be overridden by the caller if necessary.
CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
# Options to configure. This can be overridden by the caller if necessary.
CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
-# Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -g
-else
-CFLAGS=-O2 -g
-endif
-export CFLAGS
-
# Install commands. You wouldn't normally override these.
INSTALL=install
INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
# Install commands. You wouldn't normally override these.
INSTALL=install
INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
@@
-69,13
+67,7
@@
build:
echo ./autogen.sh;\
./autogen.sh;\
fi
echo ./autogen.sh;\
./autogen.sh;\
fi
- @set -e;if test ! -f config.status; then \
- echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
- ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
- else\
- echo ./config.status;\
- ./config.status;\
- fi
+ ./configure ${CONFIGURE} ${CONFIGURE_EXTRA}
$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
pkg-disorder: build
$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
pkg-disorder: build
@@
-123,7
+115,7
@@
pkg-disorder: build
dpkg-shlibdeps -Tdebian/substvars.disorder \
debian/disorder/usr/bin/*
$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
dpkg-shlibdeps -Tdebian/substvars.disorder \
debian/disorder/usr/bin/*
$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
- BUGS README.* \
+ BUGS README.*
docs.css
\
debian/disorder/usr/share/doc/disorder/.
gzip -9f debian/disorder/usr/share/doc/disorder/README \
debian/disorder/usr/share/doc/disorder/README.* \
debian/disorder/usr/share/doc/disorder/.
gzip -9f debian/disorder/usr/share/doc/disorder/README \
debian/disorder/usr/share/doc/disorder/README.* \
@@
-186,6
+178,7
@@
pkg-disorder-server: build
$(MKDIR) debian/disorder-server/etc/init.d
$(MKDIR) debian/disorder-server${cgiexecdir}
$(MKDIR) debian/disorder-server/var/lib/disorder
$(MKDIR) debian/disorder-server/etc/init.d
$(MKDIR) debian/disorder-server${cgiexecdir}
$(MKDIR) debian/disorder-server/var/lib/disorder
+ $(MKDIR) debian/disorder-server/etc/cron.daily
$(INSTALL_SCRIPT) examples/disorder.init \
debian/disorder-server/etc/init.d/disorder
$(INSTALL_DATA) debian/etc.disorder.config \
$(INSTALL_SCRIPT) examples/disorder.init \
debian/disorder-server/etc/init.d/disorder
$(INSTALL_DATA) debian/etc.disorder.config \
@@
-194,6
+187,7
@@
pkg-disorder-server: build
debian/disorder-server/etc/disorder/options
$(INSTALL_DATA) debian/etc.disorder.options.user \
debian/disorder-server/etc/disorder/options.user
debian/disorder-server/etc/disorder/options
$(INSTALL_DATA) debian/etc.disorder.options.user \
debian/disorder-server/etc/disorder/options.user
+ $(INSTALL_SCRIPT) debian/disorder.daily debian/disorder-server/etc/cron.daily/disorder
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
gzip -9f debian/disorder-server/usr/share/man/man*/*
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
gzip -9f debian/disorder-server/usr/share/man/man*/*
@@
-274,6
+268,7
@@
pkg-disobedience: build
$(MKDIR) debian/disobedience/usr/share/man/man1
$(MKDIR) debian/disobedience/usr/share/pixmaps
$(MKDIR) debian/disobedience/usr/share/menu
$(MKDIR) debian/disobedience/usr/share/man/man1
$(MKDIR) debian/disobedience/usr/share/pixmaps
$(MKDIR) debian/disobedience/usr/share/menu
+ $(MKDIR) debian/disobedience/usr/share/doc-base
$(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
strip --remove-section=.comment debian/disobedience/usr/bin/disobedience
$(INSTALL_DATA) doc/disobedience.1 \
$(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
strip --remove-section=.comment debian/disobedience/usr/bin/disobedience
$(INSTALL_DATA) doc/disobedience.1 \
@@
-283,6
+278,8
@@
pkg-disobedience: build
debian/disobedience/usr/share/pixmaps
$(INSTALL_DATA) debian/usr.share.menu.disobedience \
debian/disobedience/usr/share/menu/disobedience
debian/disobedience/usr/share/pixmaps
$(INSTALL_DATA) debian/usr.share.menu.disobedience \
debian/disobedience/usr/share/menu/disobedience
+ $(INSTALL_DATA) debian/disobedience-manual \
+ debian/disobedience/usr/share/doc-base/disobedience-manual
gzip -9f debian/disobedience/usr/share/man/man*/*
dpkg-shlibdeps -Tdebian/substvars.disobedience \
debian/disobedience/usr/bin/*
gzip -9f debian/disobedience/usr/share/man/man*/*
dpkg-shlibdeps -Tdebian/substvars.disobedience \
debian/disobedience/usr/bin/*
@@
-320,7
+317,7
@@
binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
binary-indep:
clean:
binary-indep:
clean:
- test -f Makefile && $(MAKE) distclean
+ if test -f Makefile; then $(MAKE) distclean; fi
rm -f config.cache
rm -f debian/files
rm -f debian/substvars.*
rm -f config.cache
rm -f debian/files
rm -f debian/substvars.*