diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2009-06-04 12:54:44 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2009-06-04 12:54:44 +0000 |
| commit | 35a824943dc146c8a67b223fe876b1c362699f1c (patch) | |
| tree | f0f33c6220beb17fdc7e171d1ad8ea8f7c70746f /cad | |
| parent | - update to 1.0.1 (diff) | |
- Attempt to fix build with custom LOCALBASE
Reported by: QS Tindie
Notes
Notes:
svn path=/head/; revision=235164
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/oregano/Makefile | 2 | ||||
| -rw-r--r-- | cad/oregano/files/patch-SConstruct | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile index 17c531bb4e30..ea0839db3d92 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -31,7 +31,7 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: - @${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g" ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g;s|%%PREFIX%%|${PREFIX}|;s|pkg-config|${LOCALBASE}/bin/pkg-config|g" ${WRKSRC}/SConstruct .if defined(WITHOUT_NLS) @${REINPLACE_CMD} -e "/^SConscript ('po\/SConscript')/d" ${WRKSRC}/SConstruct .endif diff --git a/cad/oregano/files/patch-SConstruct b/cad/oregano/files/patch-SConstruct index b4aa64e4d45b..8a93251add8a 100644 --- a/cad/oregano/files/patch-SConstruct +++ b/cad/oregano/files/patch-SConstruct @@ -5,7 +5,7 @@ opts.Add (BoolOption ('RunUpdateMimeDatabase', 'Set to no if you don\'t want to run update-mime-database', 1)); opts.Add (BoolOption ('Debug', 'Set to yes you want to compile with debug symbolse', 0)); -opts.Add (PathOption ('PREFIX', 'System base prefix path', '/usr/local')); -+opts.Add (PathOption ('PREFIX', 'System base prefix path', '/usr/local', PathOption.PathIsDirCreate)); ++opts.Add (PathOption ('PREFIX', 'System base prefix path', '%%PREFIX%%', PathOption.PathIsDirCreate)); opts.Add (PackageOption ('DESTDIR', 'System base installation path', '/')); # Dependencies # |