e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Skip E-docs (now in edox-data package). Rename dox to edox. 

SVN revision: 9333
This commit is contained in:
Kim Woelders 2004-03-11 21:29:28 +00:00
parent 3725a5c98d
commit 2ececc21dd
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -199,14 +199,6 @@ echo "Warning: No ales were found in your refrigerator."
echo " We highly suggest that you rectify this situation immediately."
])
edocdata=`ls -1 $srcdir/dox/E-docs | egrep -v '(Makefile|CVS|^misc|\.sh$)'`
edocexec=`ls -1 $srcdir/dox/E-docs | egrep '\.sh$'`
edocdata=`echo $edocdata`
edocexec=`echo $edocexec`
AC_SUBST(edocdata)
AC_SUBST(edocexec)
AC_OUTPUT([
Makefile
src/Makefile
@ -215,7 +207,6 @@ src/themes/configs/Makefile
src/themes/configs/pix/Makefile
src/themes/configs/backup/Makefile
dox/Makefile
dox/E-docs/Makefile
eesh/Makefile
epp/Makefile
man/Makefile

11
dox/Makefile.am
View File

@ -1,16 +1,9 @@
SUBDIRS=E-docs
EXTRA_DIST = ChangeLog README
bin_PROGRAMS = dox
bin_PROGRAMS = edox
dox_SOURCES = \
format.c \
file.c \
ttfont.c \
text.c \
dox.c \
dox.h
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) $(XINERAMA_LIBS) -lm

4
src/main.c
View File

@ -29,7 +29,7 @@ runDocBrowser(void)
{
char file[FILEPATH_LEN_MAX];
Esnprintf(file, sizeof(file), "%s/dox", EDirBin());
Esnprintf(file, sizeof(file), "%s/edox", EDirBin());
if (!canexec(file))
return;
Esnprintf(file, sizeof(file), "%s/E-docs", EDirRoot());
@ -39,7 +39,7 @@ runDocBrowser(void)
if (fork())
EDBUG_RETURN_;
Esnprintf(file, sizeof(file), "exec %s/dox %s/E-docs",
Esnprintf(file, sizeof(file), "exec %s/edox %s/E-docs",
EDirBin(), EDirRoot());
execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, NULL);

4
src/misc.c
View File

@ -58,10 +58,10 @@ BlumFlimFrub(void)
if (!canexec(s))
{
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
"Enlightenment's dox executable is not able to be executed:\n"
"Enlightenment's utility executable is not able to be executed:\n"
"\n" "%s\n"
"This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure dox is installed\n"
"Please rectify this situation and ensure it is installed\n"
"correctly.\n"), s);
EExit(NULL);
}

4
src/themes/configs/menus.cfg
View File

@ -108,9 +108,9 @@ ADD_MENU_SUBMENU_TEXT_ITEM("Desktop", "DESKTOP_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Settings", "CONFIG_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Themes", "THEMES_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Maintenance", "MAINT_SUBMENU")
ADD_MENU_TEXT_ITEM("Help", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $EROOT"/E-docs")
ADD_MENU_TEXT_ITEM("Help", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $EROOT"/E-docs")
ADD_MENU_TEXT_ITEM("About Enlightenment", __A_ABOUT, "")
ADD_MENU_TEXT_ITEM("About this theme", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $ETHEME"/ABOUT")
ADD_MENU_TEXT_ITEM("About this theme", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $ETHEME"/ABOUT")
ADD_MENU_TEXT_ITEM("Restart Enlightenment",__A_EXIT, "restart")
ADD_MENU_TEXT_ITEM("Log Out", __A_EXIT, "logout")
END_MENU