Skip to content

Commit 77a0fb0

Browse files
committed
After running make it should be able to be used directly from git inside
/Programs
1 parent 295d20d commit 77a0fb0

File tree

1 file changed

+28
-20
lines changed

1 file changed

+28
-20
lines changed

Makefile

+28-20
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,27 @@ INSTALL_FILE = install
88
INSTALL_DIR = install -d
99

1010
PYTHON_VERSION=2.7
11-
PYTHON_LIBS=Corrections
11+
PYTHON_LIBS=FindPackage GetAvailable GuessLatest CheckDependencies DescribeProgram UseFlags Corrections
1212
PYTHON_SITE=python$(PYTHON_VERSION)/site-packages
1313

14-
MAN_FILES = $(shell grep -l Parse_Options bin/* | xargs -i echo {}.1)
15-
EXEC_FILES = $(patsubst src/%.c,bin/%,$(wildcard src/*.c))
14+
RUBY_VERSION=1.8
15+
RUBY_SITE=ruby/site_ruby/$(RUBY_VERSION)
16+
RUBY_DIR=$(RUBY_SITE)/gobo
17+
18+
MAN_FILES = $(shell cd bin;grep -l Parse_Options * | xargs -i echo share/man/man1/{}.1)
19+
EXEC_FILES = $(patsubst src/%.c,%,$(wildcard src/*.c))
1620
SCRIPT_FILES = AddUser AttachProgram DeduceName FindPackage GoboPath install PrioritiseUpdates ScriptFunctions UnversionExecutables VersionExecutables Alien AugmentCommandNotFoundDatabase Dependencies FindQuick GrepQuick InstallPackage ProblemReport SignProgram UpdateKdeRecipe which Alien-Cabal CheckDependants DescribeProgram FixAttributes GrepReplace KillProcess RemoveBroken SuggestDuplicates UpdateSettings xmlcatalog Alien-CPAN CheckDependencies DetachProgram FixDirReferences GuessLatest ListProgramFiles RemoveEmpty SuggestUpdates UpdateXorgRecipe Alien-LuaRocks CleanModules DisableProgram FixInfo GuessProgramCase RemoveProgram SymlinkProgram UpgradeSystem Alien-PIP Corrections FilterColors GenBuildInformation HasCompatiblePackage MergeTree Rename SystemFind UseFlags Alien-RubyGems CreatePackage FilterLines GetAvailable Hashes NamingConventions RescueInstallPackage SystemInfo VerifyProgram
1721

1822
.PHONY: all clean install
1923

20-
all: python_all
24+
all: python manuals
2125
@$(MAKE) -C src
26+
$(foreach EXE_FILE, $(EXEC_FILES), \
27+
cp -af src/$(EXE_FILE) bin ; \
28+
chmod a+x bin/$(EXE_FILE) ; \
29+
)
2230

23-
python_all:
31+
python:
2432
mkdir -p lib/$(PYTHON_SITE)
2533
$(foreach PYTHON_LIB, $(PYTHON_LIBS), \
2634
ln -nfs ../../../bin/$(PYTHON_LIB) lib/$(PYTHON_SITE)/$(PYTHON_LIB).py ; \
@@ -37,31 +45,31 @@ python_clean:
3745
clean: python_clean
3846
@$(MAKE) -C src clean
3947
@echo "Cleaning man pages"
40-
$(foreach MAN_FILE, $(MAN_FILES), \
41-
rm -f $(MAN_FILE) ; \
42-
)
48+
rm -rf share/man/man1
4349
@echo "Cleaning binaries"
4450
$(foreach EXE_FILE, $(EXEC_FILES), \
45-
rm -f $(EXE_FILE) ; \
51+
rm -f src/$(EXE_FILE) ; \
52+
rm -f bin/$(EXE_FILE) ; \
4653
)
4754
rm -rf Resources/FileHash*
4855

49-
python_install:
56+
python_install: python
5057
@echo "Installing python libraries"
51-
mkdir -p lib/$(PYTHON_SITE)
52-
cp -r lib/$(PYTHON_SITE) $(DESTDIR)/lib
58+
mkdir -p $(DESTDIR)/lib/$(dir $(PYTHON_SITE))
59+
cp -r lib/$(dir $(PYTHON_SITE)) $(DESTDIR)/lib
5360

54-
manuals: $(MAN_FILES)
61+
ruby_install:
62+
@echo "Installing ruby libraries"
63+
$(INSTALL_DIR) -d -m 755 $(DESTDIR)/lib/$(RUBY_SITE)
64+
cp -r lib/$(RUBY_DIR) $(DESTDIR)/lib/$(RUBY_SITE)
5565

56-
$(MAN_FILES): %.1: %
57-
@echo "Generating man page $@"
66+
$(MAN_FILES): share/man/man1/%.1: bin/%
67+
@mkdir -p share/man/man1
5868
help2man --name=" " --source="GoboLinux" --no-info $< --output $@
5969

60-
$(EXEC_FILES): bin/%: src/%
61-
cp -af $< $@
62-
chmod a+x $@
70+
manuals: $(MAN_FILES)
6371

64-
install_manuals: manuals
72+
install_manuals: $(MAN_FILES)
6573
$(INSTALL_DIR) -d -m 755 $(DESTDIR)/share/man/man1
6674
$(foreach MAN_FILE, $(MAN_FILES), \
6775
$(INSTALL_FILE) -m 644 $(MAN_FILE) $(DESTDIR)/share/man/man1 ; \
@@ -95,6 +103,6 @@ prepare_install:
95103
@echo "Installing $(PROGRAM) into $(DESTDIR)"
96104
$(INSTALL_DIR) -m 755 $(DESTDIR)
97105

98-
install: all prepare_install install_scripts install_data install_resources install_share_data install_functions python_install install_manuals
106+
install: all prepare_install install_scripts install_data install_resources install_share_data install_functions python_install ruby_install install_manuals
99107
@$(MAKE) DESTDIR=$(DESTDIR) -C src install
100108
@echo "Installed $(PROGRAM) into $(DESTDIR)"

0 commit comments

Comments
 (0)