From 5833265c0e6ce13faf8f240e3d9ecf49dd562a70 Mon Sep 17 00:00:00 2001 From: mpv Date: Wed, 8 Jun 2005 04:22:12 +0000 Subject: [PATCH] Porting to Mandrake 10.1 and new products: OCC 5.2.3 compatibility: different Plugin formats for OCAF in different versions --- Makefile.in | 11 +++++++++-- resources/Plugin | 10 ---------- resources/Plugin.in | 10 ++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 resources/Plugin create mode 100755 resources/Plugin.in diff --git a/Makefile.in b/Makefile.in index 5c92e402e..1d9104d3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,7 +83,6 @@ uc_del.png \ uc_new.png \ uc_clear.png \ channel.cfg \ -Plugin \ SALOMEDS_Resources BIN_SCRIPT= \ @@ -175,6 +174,10 @@ install-bin: $(BIN_SCRIPT) $(INSTALL) -d $(bindir) $(INSTALL_PROGRAM) $^ $(bindir) +# install Plugin file +install-plugin: $(top_builddir)/share/salome/resources/Plugin + ($(INSTALL_DATA) $^ $(datadir)/resources/. || exit 1); \ + uninstall: uninstall-idl uninstall-idl: @@ -190,5 +193,9 @@ distclean-other: @MODULE@ -install: install-bin install-include install-make install-end +$(top_builddir)/share/salome/resources/Plugin: resources/Plugin + cp -f $< $@ ; \ + +resources: $(top_builddir)/share/salome/resources/Plugin +install: install-bin install-include install-make install-plugin install-end diff --git a/resources/Plugin b/resources/Plugin deleted file mode 100644 index 82126243f..000000000 --- a/resources/Plugin +++ /dev/null @@ -1,10 +0,0 @@ -! Description of available plugins -! ******************************** -! -a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin -! -! standard attribute drivers plugin -! -ad696000-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin -ad696001-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin -ad696002-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin diff --git a/resources/Plugin.in b/resources/Plugin.in new file mode 100755 index 000000000..3d4fad5e5 --- /dev/null +++ b/resources/Plugin.in @@ -0,0 +1,10 @@ +! Description of available plugins +! ******************************** +! +a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin +! +! standard attribute drivers plugin +! +ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ +ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ +ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ -- 2.39.2