projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d7ae630
)
Ticket #31999 Fix issues with ordering of debian package builds
author
Jeremy Davis
<jeremyd@freeside.biz>
Fri, 7 Nov 2014 21:03:24 +0000
(16:03 -0500)
committer
Jeremy Davis
<jeremyd@freeside.biz>
Fri, 7 Nov 2014 21:03:24 +0000
(16:03 -0500)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
38fdcc7
..
be6ce51
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-122,12
+122,14
@@
install-stamp: build-stamp
install -d $(FREESIDE_DOCUMENT_ROOT)
install -d $(TMP)-webui/usr/local/etc/freeside/
install -d $(FREESIDE_DOCUMENT_ROOT)
install -d $(TMP)-webui/usr/local/etc/freeside/
+ install -d $(TMP)/usr/local/etc/freeside/
install -d $(FREESIDE_CACHE)/masondata #MASONDATA
install -d $(FREESIDE_CACHE)/masondata #MASONDATA
- $(MAKE) -e DESTDIR=$(TMP)-webui install-docs
+ # Install configuration files, hack what to do???
+ $(MAKE) -e DESTDIR=$(TMP) create-config
- #
Ugly hack, why is handler.pl not being "handled" by install-doc
s
- install -D htetc/handler.pl DESTDIR=$(FREESIDE_CACHE)
+ #
Install interface
s
+ $(MAKE) -e DESTDIR=$(TMP)-webui install-docs
# Create Apache configurations
install -d $(APACHE_CONF)
# Create Apache configurations
install -d $(APACHE_CONF)
@@
-139,23
+141,22
@@
install-stamp: build-stamp
s'${TMP}(-webui)?''g;\
" $(TMP)-webui/etc/freeside/apache2/*
s'${TMP}(-webui)?''g;\
" $(TMP)-webui/etc/freeside/apache2/*
- # Install configuration files, hack what to do???
- $(MAKE) -e DESTDIR=$(TMP) create-config
+ # Install init
$(MAKE) -e DESTDIR=$(TMP) install-init
#hack the build dir out of Freeside too. oh yeah, sucky.
perl -p -i -e "\
s'${TMP}(-webui)?''g;\
$(MAKE) -e DESTDIR=$(TMP) install-init
#hack the build dir out of Freeside too. oh yeah, sucky.
perl -p -i -e "\
s'${TMP}(-webui)?''g;\
- " ${TMP}
-webui/usr/share
/freeside/handler.pl \
+ " ${TMP}
/usr/local/etc
/freeside/handler.pl \
${TMP}/usr/share/perl5/FS/* \
${TMP}/usr/share/perl5/FS/*/* \
${TMP}/usr/bin/*
${TMP}/usr/share/perl5/FS/* \
${TMP}/usr/share/perl5/FS/*/* \
${TMP}/usr/bin/*
- #
b
ack the build dur out of lib
+ #
h
ack the build dur out of lib
perl -p -i -e "\
s'${TMP}-lib?''g;\
s'${TMP}(-webui)?''g;\
perl -p -i -e "\
s'${TMP}-lib?''g;\
s'${TMP}(-webui)?''g;\
- " ${TMP}
-webui
/usr/local/etc/freeside/handler.pl \
+ " ${TMP}/usr/local/etc/freeside/handler.pl \
${TMP}-lib/usr/share/perl5/FS/*.pm \
${TMP}-lib/usr/share/perl5/FS/*/*.pm
${TMP}-lib/usr/share/perl5/FS/*.pm \
${TMP}-lib/usr/share/perl5/FS/*/*.pm