Skip to content

Commit

Permalink
get rid of the relative path and determination of PRO_ENGINEER_DIR fr…
Browse files Browse the repository at this point in the history
…om configure.ac and just wire the path in like everything else does. this hopefully resolves the gentoo sandbox error.

svn:revision:23781
cvs:account:brlcad
cvs:branch:trunk
  • Loading branch information
brlcad committed Jan 26, 2005
1 parent 5062a36 commit dcca30c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
8 changes: 0 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1879,14 +1879,6 @@ dnl sample applications
SAMPLE_APPLICATIONS_DIR='${prefix}/sample_applications'
AC_SUBST(SAMPLE_APPLICATIONS_DIR)

dnl pro-engineer plug-in (lib/.. is needed to fake out libtool)
if test "x${prefix}" = "xNONE" ; then
PRO_ENGINEER_DIR="${ac_default_prefix}/lib/../pro-engineer"
else
PRO_ENGINEER_DIR="${prefix}/lib/../pro-engineer"
fi
AC_SUBST(PRO_ENGINEER_DIR)


AC_CONFIG_FILES([
Makefile
Expand Down
14 changes: 7 additions & 7 deletions misc/pro-engineer/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ AM_CPPFLAGS = \
-I$(PROTOOL_SRC)/includes \
-I$(PRODEV_SRC)/includes

proe_brldir = @PRO_ENGINEER_DIR@/$(PRO_MACHINE_TYPE)
proe_brldir = ${prefix}/pro-engineer/$(PRO_MACHINE_TYPE)
proe_brl_CFLAGS = $(AM_CFLAGS)
proe_brl_LDADD = $(PTLIB) $(PDLIB) $(SYSLIBS)
proe_brl_SOURCES = proe-brl.c
Expand All @@ -42,7 +42,7 @@ proe_brl_SOURCES = proe-brl.c
# libproe2brl_la_CFLAGS = $(AM_CFLAGS)
# libproe2brl_la_LDFLAGS = -multigot -rpath $(libdir) -T10000000 -B symbolic
# libproe2brl_la_LIBADD = $(PTLIB_DLL) $(PDLIB_DLL) $(BRLLIBS) $(SYSLIBS)
# libproe2brl_sodir = @PRO_ENGINEER_DIR@/$(PRO_MACHINE_TYPE)
# libproe2brl_sodir = ${prefix}/pro-engineer/$(PRO_MACHINE_TYPE)

libproe2brl.so: mk
make -f mk dll
Expand Down Expand Up @@ -98,19 +98,19 @@ unlock2:
plugin: proe-brl
@@ECHO@ "---"
@@ECHO@ "Run 'make unlock' to unlock the Pro-Engineer plugin for distribution"
@@ECHO@ "Run 'make install' to install the Pro-Engineer plugin into @PRO_ENGINEER_DIR@"
@@ECHO@ "Run 'make install' to install the Pro-Engineer plugin"
@@ECHO# "You will need to edit protk.dat to use this plugin instead of libproe2brl.so"
@@ECHO@

plugin2: libproe2brl.so
@@ECHO@ "---"
@@ECHO@ "Run 'make unlock2' to unlock the Pro-Engineer .so plugin for distribution"
@@ECHO@ "Run 'make install' to install the Pro-Engineer .so plugin into @PRO_ENGINEER_DIR@"
@@ECHO@ "Run 'make install' to install the Pro-Engineer .so plugin"
@@ECHO@

proedir = @PRO_ENGINEER_DIR@
tmsgdir = @PRO_ENGINEER_DIR@/text/usascii/
rsrcdir = @PRO_ENGINEER_DIR@/text/usascii/resource/
proedir = ${prefix}/pro-engineer
tmsgdir = ${prefix}/pro-engineer/text/usascii/
rsrcdir = ${prefix}/pro-engineer/text/usascii/resource/

proe_DATA = \
install.doc \
Expand Down

0 comments on commit dcca30c

Please sign in to comment.