diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f87e3..a27fb37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ project( mdebase ) +include(GNUInstallDirs) +configure_file(wizard.sh.in wizard.sh) + add_subdirectory(mdm) add_subdirectory(milkwm) add_subdirectory(mpanel) diff --git a/mdm/main.c b/mdm/main.c index 6d733e5..3d37996 100644 --- a/mdm/main.c +++ b/mdm/main.c @@ -40,10 +40,6 @@ int main(int argc, char** argv) { return 0; } - if(access(CONFDIR, F_OK) != 0) mkdir(CONFDIR, 0755); - if(access(CONFDIR "/mdm", F_OK) != 0) mkdir(CONFDIR "/mdm", 0755); - if(access(CONFDIR "/mdm/mdmrc", F_OK) != 0) MDEFileCopy(DATAROOTDIR "/examples/mdm/mdmrc", CONFDIR "/mdm/mdmrc"); - parse_config(); if(getenv("DISPLAY") != NULL) backup = MDEStringDuplicate(getenv("DISPLAY")); diff --git a/milkwm/CMakeLists.txt b/milkwm/CMakeLists.txt index 9efad94..3beca76 100644 --- a/milkwm/CMakeLists.txt +++ b/milkwm/CMakeLists.txt @@ -3,10 +3,13 @@ include(MDEPkgConfig) setup_project(milkwm ${CMAKE_INSTALL_BINDIR}) pkg_config_add(milkwm x11) -pkg_config_add(milkwm inih) +pkg_config_add(milkwm libconfig) target_link_libraries( milkwm PRIVATE pthread ) + +include(GNUInstallDirs) +configure_file(milkwmrc.in milkwmrc) diff --git a/milkwm/milkwmrc.in b/milkwm/milkwmrc.in new file mode 100644 index 0000000..3f6c6f9 --- /dev/null +++ b/milkwm/milkwmrc.in @@ -0,0 +1,16 @@ +Window: { + TitleBar: { + Buttons: { + # Ordered from left to right + Left = [ + "Close" + ]; + + # Ordered from right to left + Right = [ + "Maximize", + "Iconify" + ]; + }; + }; +}; diff --git a/wizard.sh.in b/wizard.sh.in new file mode 100755 index 0000000..aa6e26d --- /dev/null +++ b/wizard.sh.in @@ -0,0 +1,6 @@ +#!/bin/sh +mkdir -p "@CMAKE_INSTALL_FULL_SYSCONFDIR@/mdm" +mkdir -p "@CMAKE_INSTALL_FULL_SYSCONFDIR@/milkwm" + +cp "@CMAKE_CURRENT_BINARY_DIR@/mdm/mdmrc" "@CMAKE_INSTALL_FULL_SYSCONFDIR@/mdm/" +cp "@CMAKE_CURRENT_BINARY_DIR@/milkwm/milkwmrc" "@CMAKE_INSTALL_FULL_SYSCONFDIR@/milkwm/"