remove readmesdir-- just put readmes in the libdirs

abstractions/Makefile

@@ -352,10 +352,6 @@ timestretch_install:
 #	install -d $(DESTDIR)$(manualsdir)/$(TIMESTRETCH_NAME)
 #	install -p $(abstractions_src)/timestretch/doc/*.txt \
 #		 $(DESTDIR)$(manualsdir)/$(TIMESTRETCH_NAME)
-#	install -d $(DESTDIR)$(readmesdir)
-#	install -p $(abstractions_src)/timestretch/README \
-#		$(DESTDIR)$(readmesdir)/$(TIMESTRETCH_NAME).txt
-
 
 
 #-------------------------------------------------------------------------------
@@ -369,14 +365,14 @@ pd-wavelet_install:
 		$(DESTDIR)$(objectsdir)/$(PDWAVELET_NAME)
 	install -p $(abstractions_src)/pd-wavelet/main.pd \
 		 $(DESTDIR)$(objectsdir)/$(PDWAVELET_NAME)
+	install -p $(abstractions_src)/pd-wavelet/README.txt \
+		 $(DESTDIR)$(objectsdir)/$(PDWAVELET_NAME)
+
 	$(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(PDWAVELET_NAME) \
 		--author "Raul Diaz Poblete" \
 		--description "manipulation of audio in the wavelet domain" \
 		--license "GNU GPL v2" \
 		--version "" 
-	install -d $(DESTDIR)$(readmesdir)
-	install -p $(abstractions_src)/pd-wavelet/README.txt \
-		$(DESTDIR)$(readmesdir)/$(PDWAVELET_NAME).txt
 
 
 #==============================================================================#

externals/Makefile

@@ -161,7 +161,7 @@ all: $(LIB_TARGETS)
 	@echo "Compiled externals for $(OS_NAME) aka $(UNAME)"
 
 
-install: $(examplesdir) $(manualsdir) $(objectsdir) $(readmesdir) \
+install: $(examplesdir) $(manualsdir) $(objectsdir) \
 all $(patsubst %, %_install,$(LIB_TARGETS))
 	@echo " "
 	@echo "externals install succeeded!"
@@ -244,9 +244,6 @@ template_install: template
 #	install -d $(manualsdir)/$(TEMPLATE_NAME)
 #	install -p $(externals_src)/template/manual.txt \
 #		$(manualsdir)/$(TEMPLATE_NAME)
-	install -d $(readmesdir)
-	install -p $(externals_src)/template/README \
-		$(readmesdir)/$(TEMPLATE_NAME).txt
 	install -d $(DESTDIR)$(examplesdir)/$(TEMPLATE_NAME)
 	install -p $(externals_src)/template/examples/*.pd \
 		$(DESTDIR)$(examplesdir)/$(TEMPLATE_NAME)
@@ -834,9 +831,8 @@ hidin_install: hidin
 		--license "GNU GPL"
 	install -p $(HIDIN_DLL) $(DESTDIR)$(objectsdir)/$(HIDIN_NAME)
 #	install -d $(DESTDIR)$(manualsdir)/$(HIDIN_NAME)
-#	install -d $(DESTDIR)$(readmesdir)
 #	install -p $(externals_src)/olafmatt/hidin/README \
-#		$(DESTDIR)$(readmesdir)/$(HIDIN_NAME).txt
+#		$(DESTDIR)$(objectsdir)/$(HIDIN_NAME)
 #	install -d $(DESTDIR)$(examplesdir)/$(HIDIN_NAME)
 #	install -p $(externals_src)/olafmatt/hidin/examples/*.pd \
 #		$(DESTDIR)$(examplesdir)/$(HIDIN_NAME)
@@ -868,9 +864,8 @@ iem_ambi_install: iem_ambi
 	install -p $(externals_src)/iem/iem_ambi/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEM_AMBI_NAME)
 #	install -d $(DESTDIR)$(manualsdir)/$(IEM_AMBI_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_ambi/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEM_AMBI_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEM_AMBI_NAME)/README.txt
 #	install -d $(DESTDIR)$(examplesdir)/$(IEM_AMBI_NAME)
 #	install -p $(externals_src)/iem/iem_ambi/examples/*.pd \
 #		$(DESTDIR)$(examplesdir)/$(IEM_AMBI_NAME)
@@ -901,9 +896,8 @@ iem_bin_ambi_install: iem_bin_ambi
 	install -p $(externals_src)/iem/iem_bin_ambi/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEM_BIN_AMBI_NAME)
 #	install -d $(DESTDIR)$(manualsdir)/$(IEM_BIN_AMBI_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_bin_ambi/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEM_BIN_AMBI_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEM_BIN_AMBI_NAME)/README.txt
 #	install -d $(DESTDIR)$(examplesdir)/$(IEM_BIN_AMBI_NAME)
 #	install -p $(externals_src)/iem/iem_bin_ambi/examples/*.pd \
 #		$(DESTDIR)$(examplesdir)/$(IEM_BIN_AMBI_NAME)
@@ -978,9 +972,8 @@ iemguts_install: iemguts
 	install -p $(IEMGUTS_OBJECTS:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(IEMGUTS_NAME)
 	install -p $(externals_src)/iem/iemguts/help/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMGUTS_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iemguts/README.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMGUTS_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMGUTS_NAME)
 	install -d $(DESTDIR)$(examplesdir)/$(IEMGUTS_NAME)
 	install -p $(externals_src)/iem/iemguts/examples/*.pd \
 		$(DESTDIR)$(examplesdir)/$(IEMGUTS_NAME)
@@ -1102,9 +1095,8 @@ jasch_lib_install: jasch_lib
 #	install -d $(DESTDIR)$(manualsdir)/$(JASCH_LIB_NAME)
 #	install -p $(externals_src)/jasch_lib/manual.txt \
 #		$(DESTDIR)$(manualsdir)/$(JASCH_LIB_NAME)
-#	install -d $(DESTDIR)$(readmesdir)
 #	install -p $(externals_src)/jasch_lib/README \
-#		$(DESTDIR)$(readmesdir)/$(JASCH_LIB_NAME).txt
+#		$(DESTDIR)$(objectsdir)/$(JASCH_LIB_NAME)
 #	install -d $(DESTDIR)$(examplesdir)/$(JASCH_LIB_NAME)
 #	install -p $(externals_src)/jasch_lib/examples/*.pd \
 #		$(DESTDIR)$(examplesdir)/$(JASCH_LIB_NAME)
@@ -1282,9 +1274,8 @@ moocow_install:
 #	install -p $(externals_src)/moocow/manual.txt \
 #		$(DESTDIR)$(manualsdir)/$(MOOCOW_NAME) \
 #	  || echo 'moocow_install: WARNING: no manuals to install!'
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(MOOCOW_DIR)/README.txt \
-		$(DESTDIR)$(readmesdir)/$(MOOCOW_NAME).txt \
+		$(DESTDIR)$(objectsdir)/$(MOOCOW_NAME) \
 	  || echo 'moocow_install: WARNING: no README to install!'
 #	install -d $(DESTDIR)$(examplesdir)/$(MOOCOW_NAME)
 #	install -p $(MOOCOW_BUILD)/examples/*.pd \
@@ -1707,9 +1698,8 @@ tclpd: $(TCLPD_LIB)
 tclpd_install: tclpd
 	install -d $(DESTDIR)$(objectsdir)
 	install -p $(TCLPD_LIB) $(DESTDIR)$(objectsdir)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/tclpd/README \
-		$(DESTDIR)$(readmesdir)/$(TCLPD_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(TCLPD_NAME)
 #	install -d $(DESTDIR)$(examplesdir)/$(TCLPD_NAME)
 #	install -p $(externals_src)/tclpd/examples/*.pd \
 #		$(DESTDIR)$(examplesdir)/$(TCLPD_NAME)
@@ -1981,9 +1971,8 @@ pdcontainer_install: pdcontainer
 	install -p $(PDCONTAINER_TARGETS) $(DESTDIR)$(objectsdir)/$(PDCONTAINER_NAME)
 	install -p $(externals_src)/grh/PDContainer/help/*.pd \
 		$(DESTDIR)$(objectsdir)/$(PDCONTAINER_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/grh/PDContainer/readme.txt \
-		$(DESTDIR)$(readmesdir)/$(PDCONTAINER_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(PDCONTAINER_NAME)
 
 pdcontainer_clean:
 	-rm -f -- $(PDCONTAINER_TARGETS)
@@ -2026,9 +2015,8 @@ adaptive_install: adaptive
 	install -p $(ADAPTIVE_TARGETS) $(DESTDIR)$(objectsdir)/$(ADAPTIVE_NAME)
 	install -p $(externals_src)/grh/adaptive/doc/*.pd \
 		$(DESTDIR)$(objectsdir)/$(ADAPTIVE_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/grh/adaptive/readme \
-		$(DESTDIR)$(readmesdir)/$(ADAPTIVE_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(ADAPTIVE_NAME)
 	install -d $(DESTDIR)$(examplesdir)/$(ADAPTIVE_NAME)
 	install -p $(externals_src)/grh/adaptive/examples/*.pd \
 		$(externals_src)/grh/adaptive/examples/*.dat \
@@ -2095,9 +2083,8 @@ iem_delay_install: iem_delay
 	install -p $(IEMDELAY_SRC:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(IEMDELAY_NAME)
 	install -p $(externals_src)/iem/iem_delay/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMDELAY_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_delay/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMDELAY_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMDELAY_NAME)/README.txt
 
 iem_delay_clean:
 	-rm -f -- $(IEMDELAY_SRC:.c=.$(EXTENSION))
@@ -2124,9 +2111,8 @@ iem_roomsim_install: iem_roomsim
 	install -p $(IEMROOM_SRC:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(IEMROOM_NAME)
 	install -p $(externals_src)/iem/iem_roomsim/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMROOM_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_roomsim/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMROOM_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMROOM_NAME)/README.txt
 
 iem_roomsim_clean:
 	-rm -f -- $(IEMROOM_SRC:.c=.$(EXTENSION))
@@ -2153,9 +2139,8 @@ iem_spec2_install: iem_spec2
 	install -p $(IEMSPEC2_SRC:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(IEMSPEC2_NAME)
 	install -p $(externals_src)/iem/iem_spec2/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMSPEC2_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_spec2/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMSPEC2_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMSPEC2_NAME)/README.txt
 
 iem_spec2_clean:
 	-rm -f -- $(IEMSPEC2_SRC:.c=.$(EXTENSION))
@@ -2195,9 +2180,8 @@ iem_tab_install: iem_tab
 	install -p $(IEMTAB_TARGETS) $(DESTDIR)$(objectsdir)/$(IEMTAB_NAME)
 	install -p $(externals_src)/iem/iem_tab/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMTAB_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iem_tab/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMTAB_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMTAB_NAME)/README.txt
 
 iem_tab_clean:
 	-rm -f -- $(IEMTAB_TARGETS)
@@ -2223,9 +2207,8 @@ flashserver_install: flashserver
 	install -p $(FLASHSERVER_OBJECTS:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(FLASHSERVER_NAME)
 	install -p $(externals_src)/olafmatt/flashserver/*.pd \
 		$(DESTDIR)$(objectsdir)/$(FLASHSERVER_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/olafmatt/flashserver/README \
-		$(DESTDIR)$(readmesdir)/$(FLASHSERVER_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(FLASHSERVER_NAME)
 
 flashserver_clean:
 	-rm -f -- $(FLASHSERVER_OBJECTS:.c=.$(EXTENSION))
@@ -2302,9 +2285,8 @@ iemgui_install: iemgui
 	install -p $(IEMGUI_TARGETS) $(DESTDIR)$(objectsdir)/$(IEMGUI_NAME)
 	install -p $(externals_src)/iem/iemgui/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMGUI_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iemgui/READ_ME.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMGUI_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMGUI_NAME)/README.txt
 
 iemgui_clean:
 	-rm -f -- $(IEMGUI_TARGETS)
@@ -2343,9 +2325,8 @@ iemxmlrpc_install: iemxmlrpc
 	install -p $(IEMXMLRPC_TARGET) $(DESTDIR)$(objectsdir)/$(IEMXMLRPC_NAME)
 	install -p $(externals_src)/iem/iemxmlrpc/*.pd \
 		$(DESTDIR)$(objectsdir)/$(IEMXMLRPC_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/iem/iemxmlrpc/README.txt \
-		$(DESTDIR)$(readmesdir)/$(IEMXMLRPC_NAME).txt
+		$(DESTDIR)$(objectsdir)/$(IEMXMLRPC_NAME)
 	install -d $(DESTDIR)$(examplesdir)/$(IEMXMLRPC_NAME)
 	install -p $(externals_src)/iem/iemxmlrpc/*.pd \
                    $(externals_src)/iem/iemxmlrpc/*.py \

packages/Makefile.buildlayout

@@ -122,7 +122,6 @@ pddocdir = $(libpddir)/doc
 examplesdir = $(pddocdir)/examples
 helpdir = $(pddocdir)/5.reference
 manualsdir = $(pddocdir)/manuals
-readmesdir = $(manualsdir)/READMEs
 
 
 #==============================================================================#
@@ -156,10 +155,7 @@ $(manualsdir): $(DESTDIR)
 $(objectsdir): $(DESTDIR)
 	install -d $(DESTDIR)$(objectsdir)
 
-$(readmesdir): $(manualsdir)
-	install -d $(DESTDIR)$(readmesdir)
-
-installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir) $(readmesdir)
+installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir)
 
 #==============================================================================#
 #