Репозиторий ALT Linux backports/2.4
Последнее обновление: 9 июля 2008 | Пакетов: 497 | Посещений: 1575241
 поиск   регистрация   авторизация 
 
Группа :: Графические оболочки/Прочее
Пакет: fluxbox

 Главная   Изменения   Спек   Патчи   Загрузить   Bugs and FR 

Патч: fluxbox-0.9.12-alt-makefile-configure-with_menu_keys_init_options.patch


diff -ru fluxbox-0.9.12.orig/configure.in fluxbox-0.9.12/configure.in
--- fluxbox-0.9.12.orig/configure.in	2005-01-18 02:37:39 +0600
+++ fluxbox-0.9.12/configure.in	2005-02-22 17:47:50 +0600
@@ -507,13 +507,37 @@
 )
 
 AC_ARG_WITH(
+  menu,
+  [  --with-menu=path        location menu file (PREFIX/share/fluxbox/menu)],
+  DEFAULT_MENU=$with_menu,
+  DEFAULT_MENU=$prefix/share/fluxbox/menu
+)
+AC_SUBST(DEFAULT_MENU)
+
+AC_ARG_WITH(
   style,
-  [  --with-style=path       style by default (PREFIX/share/fluxbox/styles/Meta)],
+  [  --with-style=path       style by default   (PREFIX/share/fluxbox/styles/Meta)],
   DEFAULT_STYLE=$with_style,
   DEFAULT_STYLE=$prefix/share/fluxbox/styles/Meta
 )
 AC_SUBST(DEFAULT_STYLE)
 
+AC_ARG_WITH(
+  keys,
+  [  --with-keys=path        location keys file (PREFIX/share/fluxbox/keys)],
+  DEFAULT_KEYS=$with_keys,
+  DEFAULT_KEYS=$prefix/share/fluxbox/keys
+)
+AC_SUBST(DEFAULT_KEYS)
+
+AC_ARG_WITH(
+  init,
+  [  --with-init=path        location init file (PREFIX/share/fluxbox/init)],
+  DEFAULT_INIT=$with_init,
+  DEFAULT_INIT=$prefix/share/fluxbox/init
+)
+AC_SUBST(DEFAULT_INIT)
+
 dnl Determine the return type of signal handlers
 AC_TYPE_SIGNAL
 
@@ -525,7 +549,10 @@
 AC_MSG_RESULT([	$PACKAGE version $VERSION configured successfully.])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Using '$prefix' for installation.])
+AC_MSG_RESULT([Using '$DEFAULT_MENU' for location menu file.])
 AC_MSG_RESULT([Using '$DEFAULT_STYLE' by default style.])
+AC_MSG_RESULT([Using '$DEFAULT_KEYS' for location keys file.])
+AC_MSG_RESULT([Using '$DEFAULT_INIT' for location init file.])
 AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
 AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
 AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
diff -ru fluxbox-0.9.12.orig/src/Makefile.am fluxbox-0.9.12/src/Makefile.am
--- fluxbox-0.9.12.orig/src/Makefile.am	2004-11-16 02:40:45 +0600
+++ fluxbox-0.9.12/src/Makefile.am	2005-02-22 17:48:31 +0600
@@ -24,10 +24,10 @@
 
 
 SUBDIRS= FbTk
-DEFAULT_MENU=$(pkgdatadir)/menu
+DEFAULT_MENU=@DEFAULT_MENU@
 DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
-DEFAULT_KEYSFILE=$(pkgdatadir)/keys
-DEFAULT_INITFILE=
+DEFAULT_KEYSFILE=@DEFAULT_KEYS@
+DEFAULT_INITFILE=@DEFAULT_INIT@
 
 AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
 
@@ -39,7 +39,7 @@
 	echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh
 	echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
 	echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
-	echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh
+	echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
 	echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
 
 # an extra dep for fluxbox
diff -ru fluxbox-0.9.12.orig/src/Makefile.in fluxbox-0.9.12/src/Makefile.in
--- fluxbox-0.9.12.orig/src/Makefile.in	2005-01-18 03:51:08 +0600
+++ fluxbox-0.9.12/src/Makefile.in	2005-02-22 17:48:51 +0600
@@ -123,9 +123,9 @@
 DEFAULT_STYLE = $(pkgdatadir)/styles/Clean
 
 SUBDIRS = FbTk
-DEFAULT_MENU = $(pkgdatadir)/menu
-DEFAULT_KEYSFILE = $(pkgdatadir)/keys
-DEFAULT_INITFILE = 
+DEFAULT_MENU = @DEFAULT_MENU@
+DEFAULT_KEYSFILE = @DEFAULT_KEYS@
+DEFAULT_INITFILE = @DEFAULT_INIT@
 
 AM_CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/FbTk
 
@@ -2367,7 +2367,7 @@
 	echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh
 	echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
 	echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
-	echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh
+	echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
 	echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
 
 # an extra dep for fluxbox
 
design & coding: Vladimir Lettiev aka crux © 2004-2005