diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/asterisk | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'package/asterisk')
| -rw-r--r-- | package/asterisk/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 73ac40acb..791763cf2 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -166,10 +166,10 @@ do-install: asterisk-pgsql-install: ${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \ - $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf + ${INSTALL_DATA} $(WRKINST)/etc/asterisk/cdr_pgsql.conf \ + $(IDIR_ASTERISK_PGSQL)/etc/asterisk/ ${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \ + ${INSTALL_BIN} $(WRKINST)/usr/lib/asterisk/modules/cdr_pgsql.so \ $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/ asterisk-sounds-install: |