diff options
| author | Roger Hardiman <roger@FreeBSD.org> | 2000-04-04 13:38:09 +0000 |
|---|---|---|
| committer | Roger Hardiman <roger@FreeBSD.org> | 2000-04-04 13:38:09 +0000 |
| commit | 2c4b07b9596de5d0cf680c756069bf4c792a4806 (patch) | |
| tree | 9cf4c1844fd1a10b65832b20409b03cbcdeabe42 | |
| parent | Update to 0.99.1 - pre-official release. (diff) | |
Do not allow OpenH323 to autodetect the OS, OS Version and
CPU architecture.
Instead pass in the actual values, as defined in bsd.port.mk
Also, fix bug in do-install which prevented Alpha installs.
Submitted by: Karl.Dietz@frankfurt.netsurf.de
Notes
Notes:
svn path=/head/; revision=27324
| -rw-r--r-- | net/opal/Makefile | 5 | ||||
| -rw-r--r-- | net/opal3/Makefile | 5 | ||||
| -rw-r--r-- | net/openh323-112/Makefile | 5 | ||||
| -rw-r--r-- | net/openh323/Makefile | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/opal3/Makefile b/net/opal3/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/openh323-112/Makefile +++ b/net/openh323-112/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/openh323/Makefile b/net/openh323/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 |