Skip to content

Commit 287c205

Browse files
author
jkasarherou
committed
Merge pull request #1 from jfsmig/master
cmake: now uses the standard CMAKE_INSTALL_PREFIX
2 parents 0c06048 + 5ffb9f4 commit 287c205

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ set(CMAKE_C_FLAGS_DEBUG "-O0 -fno-inline")
5656
set(CMAKE_C_FLAGS_RELEASE "-O2")
5757
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -fno-inline")
5858
set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
59-
set(CMAKE_INSTALL_PREFIX "/usr/local")
6059

6160
add_definitions(-D_REENTRANT)
6261
add_definitions(-D_LARGE_FILES)
@@ -84,12 +83,6 @@ else()
8483
MESSAGE("LD_LIBDIR guessed to ${LD_LIBDIR}")
8584
endif()
8685

87-
if (PREFIX)
88-
set(CMAKE_INSTALL_PREFIX ${PREFIX})
89-
endif (PREFIX)
90-
91-
message(STATUS "Installation prefix : ${CMAKE_INSTALL_PREFIX}")
92-
9386
###-------------------------------------------------------------------------###
9487

9588
find_package(PkgConfig)

gridinit.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ limit.stack_size=1024
4949
groups_only=NS-common,NS-stgdev
5050

5151
[Alerts]
52-
plugin=/usr/local/lib/gridinit/gridinit_alert_spoolmess.so
52+
plugin=/usr/local/lib/gridinit/gridinit_alert_implementation.so
5353
symbol=MODULE_EXPORT
54-
config.sopcode=MUT-GRD-9000
55-
config.code_client=MUTU
56-
config.code_projet=HoneyComb
54+
config.sopcode=XXX-YYY-NNNN
55+
config.code_client=B2B
56+
config.code_projet=OIO-SDS
5757

5858
[service.key0]
5959

0 commit comments

Comments
 (0)