mirror of
https://github.com/Llewellynvdm/conky.git
synced 2025-02-09 07:29:02 +00:00
- Fix make dist
without having HAVE_DOCSTUFF defined
- Remove obsolete comment from freebsd.c git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@219 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
c336133dea
commit
2c8acab933
@ -12,7 +12,7 @@ conky.1: command_options.xml config_settings.xml docs.xml variables.xml
|
|||||||
${xsltproc_cmd} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${srcdir}/docs.xml > docs.html
|
${xsltproc_cmd} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${srcdir}/docs.xml > docs.html
|
||||||
man ./conky.1 | col -b > README
|
man ./conky.1 | col -b > README
|
||||||
mv README ${top_srcdir}
|
mv README ${top_srcdir}
|
||||||
|
DOCS = conky.1 docs.html
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = conkyrc.sample conky.1 docs.html command_options.xml config_settings.xml docgen.sh docs.xml variables.xml
|
EXTRA_DIST = $(DOCS) conkyrc.sample command_options.xml config_settings.xml docgen.sh docs.xml variables.xml
|
||||||
|
@ -444,8 +444,6 @@ float get_freq_dynamic()
|
|||||||
|
|
||||||
float get_freq()
|
float get_freq()
|
||||||
{
|
{
|
||||||
/* First, try to obtain CPU frequency via dev.cpu.0.freq sysctl
|
|
||||||
* (cpufreq(4)). If failed, do i386 magic. */
|
|
||||||
int freq;
|
int freq;
|
||||||
|
|
||||||
if (GETSYSCTL("dev.cpu.0.freq", freq) == 0)
|
if (GETSYSCTL("dev.cpu.0.freq", freq) == 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user