diff options
| author | Mark Wells <mark@freeside.biz> | 2015-05-28 16:58:47 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-05-28 16:58:47 -0700 |
| commit | ee2d87613c1720cdf4f97e2ee0dcc1f8dfa781ff (patch) | |
| tree | 4e9b7bf7b966512e63b9b6faee5174cc02300d00 /debian | |
| parent | 7cd918b8463886744316e2f5b6fb75feefd184e7 (diff) | |
| parent | 09ea69ac0a83cc40b02a722bc5a2baf7bd31a164 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/freeside-webui.links | 3 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/freeside-webui.links b/debian/freeside-webui.links deleted file mode 100644 index be5749a4a..000000000 --- a/debian/freeside-webui.links +++ /dev/null @@ -1,3 +0,0 @@ -etc/freeside/apache2/freeside-base2.conf etc/apache2/conf.d/freeside-base2.conf -etc/freeside/apache2/freeside-rt.conf etc/apache2/conf.d/freeside-rt.conf - diff --git a/debian/rules b/debian/rules index e82254e18..e3476d686 100755 --- a/debian/rules +++ b/debian/rules @@ -179,7 +179,7 @@ install-stamp: build-stamp perl -p -i -e "\ s'${TMP}(-webui)?''g;\ - " $(TMP)-webui/etc/freeside/apache2/* + " $(APACHE_CONF)/* # Install init $(MAKE) -e DESTDIR=$(TMP) install-init |